Commit Graph

471 Commits

Author SHA1 Message Date
Weilun Du
f11e49ee42 Fixed the bug where there are multiple developer options
BUG: 69679218

Change-Id: Ib44bf9441ecc7378d810cb55e5d9acdedbde99d6
Signed-off-by: Weilun Du <wdu@google.com>
2017-12-01 17:59:56 -08:00
Bill Yi
9b430cdf04 Import translations. DO NOT MERGE
Change-Id: I292599b6eb5b479a38b323495ae6b631bb008b7d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-12 22:22:11 -07:00
Bill Yi
59a7ff985f Import translations. DO NOT MERGE
Change-Id: I70581ba8cd4d32662b31cd156d86b90958a04e54
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-23 17:24:35 -07:00
Bo Hu
8ba336df8d Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev am: 6a962e362f
am: 969f5ae3cd

Change-Id: I87bd77e61eb23b832f8d0c37b7d3051660464001
2017-08-14 18:58:23 +00:00
Bo Hu
969f5ae3cd Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev
am: 6a962e362f

Change-Id: I65066904476b847ca9fc8c6ffa2336c4616fcbf9
2017-08-14 18:49:47 +00:00
Bo Hu
6a962e362f Merge "emulator: merge oc-emu-dev development project" into oc-mr1-dev 2017-08-14 18:34:57 +00:00
Bill Yi
1944edb864 Import translations. DO NOT MERGE
Change-Id: I0a5acfa7a31a2545da98bb0657fa4b42bee4f9ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-11 14:51:03 -07:00
Bill Yi
4b1e8aea39 Import translations. DO NOT MERGE
Change-Id: Ib3a560af925e803ad445b4e945877b977fcbad51
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-05 21:26:08 -07:00
bohu
f57025e457 emulator: merge oc-emu-dev development project
BUG: 64401460

Change-Id: I9f757a14d9bb59db2e6c62f4a4c83a4373b7b4d6
2017-08-04 16:28:34 -07:00
bohu
50dc27b2ca Revert "Emulator: update development to 2362bfb6"
It breaks build of docs because SdkSetup has dependency
on gsf-client

This reverts commit 5c26bfa4bc.
2017-06-23 14:19:05 -07:00
Huan Ren
3a14fee0ac Merge "Emulator: update development to 2362bfb6" into oc-dev 2017-06-23 18:33:16 +00:00
bohu
5c26bfa4bc Emulator: update development to 2362bfb6
Bug: 37302997

oc-emu-dev
commit 2362bfb6d6c4ee4540af5e69130951849c7e109e
Author: bohu <bohu@google.com>
Date:   Thu Apr 6 16:37:48 2017 -0700
Emulator: copy encryptionkey.img to SDK img zip

Change-Id: I057d58733bb39e0777d2f5c9494d5969ac46953a
(cherry picked from commit 6620016eb673ac885e5892604f04d3123a8ee0b9)
2017-06-15 18:13:02 +00:00
Dmitry Dementyev
ad67c43908 Update account visibility test apps to handle O SDK level.
Bug: 38462043, 38462390
Test: manual
Change-Id: Ib388e65af2adac216e9b8218ebecb7ccbf676224
2017-05-22 14:38:36 -07:00
Dmitry Dementyev
5ed60e2726 Add READ_CONTACTS permission to PushAPI test apps.
Test: manual
Bug: 36561708
Change-Id: I089c34646b93385a9dc36178e31d42b186f3b7e1
2017-03-23 12:54:31 -07:00
Dmitry Dementyev
14abf5d5f6 Update account visibility test apps.
Test: manual tests
Bug: 34841115
Change-Id: I431db9bb2c133789028b3e2bcde2cf445d1e76a1
2017-02-14 16:26:29 -08:00
Marie Janssen
cfa86afd19 Merge "BluetoothDebug: remove unused SINK_STATE_CHANGED" am: cc287d55f4 am: 0f0420e6fd am: 4fccd9723f
am: 73239bf525

Change-Id: Ib01e1d506173c9e3e9ea8ecc6c50566c5986048b
2017-01-30 18:36:36 +00:00
Marie Janssen
4fccd9723f Merge "BluetoothDebug: remove unused SINK_STATE_CHANGED" am: cc287d55f4
am: 0f0420e6fd

Change-Id: I05fb4c9f4412154addd210809d60b4788cf154be
2017-01-30 18:32:36 +00:00
Marie Janssen
d0ab7141d1 BluetoothDebug: remove unused SINK_STATE_CHANGED
android.bluetooth.a2dp.action.SINK_STATE_CHANGED is not sent from
anywhere, so it's useless to try to catch it.

Test: compiles
Bug: 34395439
Change-Id: I8185e148cf31efa820fe288c90ebed395517c722
2017-01-30 17:40:11 +00:00
Dmitry Dementyev
b99e8db305 Update PushAPI authenticator to work with new Discovery API.
Add dummy certificates to PushApi authenticator and test apps to
simplify their usage:

Bug: 33046496
Test: manual tests.
Change-Id: I94e5fa1ac430da77c0f74ed87bd12467a3ba76b8
2017-01-12 14:46:16 -08:00
Roozbeh Pournader
90689d9044 Rename language+country resources to just language
Bug: 26496609
Test: none
Change-Id: I0c6bbf6f487ad1117dd8dfae11fb0a8534ccaec4
2017-01-10 23:30:24 -08:00
Dmitry Dementyev
d9fc9adf22 Temporary remove account visibility support pushapiauthenticator.
Refactor push api test apps to have more similar code and use another
manifest entry.

Bug: https://b.corp.google.com/issues/33046496
Test: none

Change-Id: I2c87ccae0e73892eb15fb3e6f98bbb7372e0a24a
2016-12-05 14:35:04 -08:00
Bill Yi
76179cb428 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32177112
Change-Id: Ib7c37398d508c4229a582880ba0f9ede4a0b4c8f
2016-11-20 16:34:10 -08:00
Sudheer Shanka
5b6205978e Update usage of ActivityManagerNative.
Bug: 30977067
Test: N/A
Change-Id: If76488d9e7b1a33f7f5c9d65eb9254d126ef02b6
2016-11-11 15:01:34 -08:00
Nick Kralevich
d0d2326d0c Delete development_settings.xml am: e800044ab9 am: 8f6ef14178
am: bd4613528b

Change-Id: I5dc15c240bfa5d7410fb65f311626da168644eb1
2016-10-13 20:50:24 +00:00
Nick Kralevich
bd4613528b Delete development_settings.xml am: e800044ab9
am: 8f6ef14178

Change-Id: I6caca15900cc1301bfdd40be6b9e18ccd4e67749
2016-10-13 20:44:55 +00:00
Nick Kralevich
e800044ab9 Delete development_settings.xml
This does not appear to be used. Also delete stale references
in strings.xml.

Bug: 21388590
Change-Id: I032a3f88624c589e007367693711464401a21a63
2016-10-12 12:21:15 -07:00
Svet Ganov
0d12f27537 Update app using changed private API.
Change-Id: Iced526a2392c7600fe9811dec5b2d1d804aa9610
2016-08-24 07:46:12 -07:00
Svetoslav Ganov
f24d201744 Update due to a platform change am: 3a65b10528
am: 8b29aaf179

Change-Id: I749f8e06bd16e3e5c991c689e926e323b0493257
2016-08-24 02:08:34 +00:00
Svetoslav Ganov
3a65b10528 Update due to a platform change
bug:28163381

Change-Id: I59a4bad7ce947bbb60fbb1dab366efe514324110
2016-08-23 21:45:37 +00:00
Tejas Khorana
fe23a4463e Test Applications Demonstrating Push API
Applications that demonstrate the usage of Push API.

Change-Id: I4a2ace230d7ac7f699c998c0df96cf95f2e85a85
2016-08-04 15:17:40 -07:00
Evan Birenbaum
053e11283a Make the DevTools Connectivity lock non reference counted. am: a1770e75d0
am: 0ec12ccca8

Change-Id: I6aea15bd6450d4df132d09f9536dbb410997d210
2016-06-27 17:06:33 +00:00
Evan Birenbaum
0ec12ccca8 Make the DevTools Connectivity lock non reference counted.
am: a1770e75d0

Change-Id: Ia57f9f3529d29c273795546f4e4b23665be80aaa
2016-06-27 17:02:30 +00:00
Evan Birenbaum
a1770e75d0 Make the DevTools Connectivity lock non reference counted.
To avoid a race on checking if the lock is held.

Change-Id: Iee836447ab0cf6586fa8ece570cc821cd7c6fcd4
2016-06-24 16:08:29 +00:00
Bill Yi
dc45195c06 Import translations. DO NOT MERGE
Change-Id: I1fce0fb935f5e590f5a640e85af0d9a07288801a
Auto-generated-cl: translation import
2016-06-03 16:18:00 -07:00
Evan Birenbaum
5a4be418da Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev am: 738f9df0c8 am: db7f7668de
am: 58bee65056

* commit '58bee650564ae112f8070dc55cdd305a755e5b7b':
  Fix a crash when exiting the DevTools Connectivity page.

Change-Id: I2be1d3938a0c15157484aa88848e035b02664d8b
2016-05-24 20:57:06 +00:00
Evan Birenbaum
7e6f9f32ce Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev
am: 738f9df0c8

* commit '738f9df0c8e42b396a4e54a886e94fc647681f27':
  Fix a crash when exiting the DevTools Connectivity page.

Change-Id: I0a31fa64d2d5d1a6a21bcb1fad81518d03d61517
2016-05-24 20:52:00 +00:00
Evan Birenbaum
db7f7668de Merge "Fix a crash when exiting the DevTools Connectivity page." into nyc-dev
am: 738f9df0c8

* commit '738f9df0c8e42b396a4e54a886e94fc647681f27':
  Fix a crash when exiting the DevTools Connectivity page.

Change-Id: Iaf72aa95298e33f0ea2aed4c7392ecd808fca990
2016-05-24 20:52:00 +00:00
Evan Birenbaum
2817836d75 Fix a crash when exiting the DevTools Connectivity page.
A lock was being released without checking if it was held, which
resulted in a crash because WifiManager.MulticastLock is reference
counted by default.

BUG=28668604

Change-Id: I306731129894d5525e974561c2680ae7db5aff4b
2016-05-24 03:36:25 +00:00
Baligh Uddin
444dd02175 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 28463229
Change-Id: I63792d84acceba1b5d60be02bf4ebf8778b86f35
2016-05-04 01:28:16 -07:00
Bo Hu
d087f8821c Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev am: 4b0fd87660 am: 861f784752
am: 44de50be48

* commit '44de50be48ea9450d44e1aba6097c45de565c997':
  Revert "Emulator: enable predexopt for some sample apps"

Change-Id: If0ce23b2e2c8b51f451d90911623e5ab0dbc2a11
2016-05-02 17:43:48 +00:00
Bo Hu
44de50be48 Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev am: 4b0fd87660
am: 861f784752

* commit '861f784752c631e123b7dc6c0ec18bf1f8dab003':
  Revert "Emulator: enable predexopt for some sample apps"

Change-Id: I6fb0ba84480c19d0b982649829aa478c7fad3217
2016-05-02 17:39:35 +00:00
Bo Hu
a2f5ea2872 Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev
am: 4b0fd87660

* commit '4b0fd876600d41567744cc76bd572c8d2b31ea7e':
  Revert "Emulator: enable predexopt for some sample apps"

Change-Id: I3f43230d40612cba121f4b9750dfa0a5c981eee7
2016-05-02 17:35:14 +00:00
Bo Hu
4b0fd87660 Merge "Revert "Emulator: enable predexopt for some sample apps"" into nyc-dev 2016-05-02 17:20:15 +00:00
Bo Hu
14e8cd50f2 Revert "Emulator: enable predexopt for some sample apps"
because it breaks jank tests.
revert first


This reverts commit 59581fb6d4.

Change-Id: Ic4b07b28edd387826fc58df86b02bbab460c9074
2016-05-02 17:16:53 +00:00
Bo Hu
0178ee0e9f Merge "Merge "Emulator-ATV: Increase SdkSetup HOME intent priority" into nyc-dev am: 981982fd0c am: 4daac254a2" into nyc-mr1-dev-plus-aosp
am: 49df3f151c

* commit '49df3f151c762a3da4b8cfcca44c07923dda03f6':
  Emulator-ATV: Increase SdkSetup HOME intent priority

Change-Id: I61ae3479e048f147ed374793dabfd4ee1f92aff7
2016-04-28 22:45:37 +00:00
bohu
4daac254a2 Merge "Emulator-ATV: Increase SdkSetup HOME intent priority" into nyc-dev
am: 981982fd0c

* commit '981982fd0ca5e48f58c3eedb57ae67ca508202b6':
  Emulator-ATV: Increase SdkSetup HOME intent priority

Change-Id: Iebfdb46acbd1dece675db376af9b2cc7840a4e8b
2016-04-28 22:40:29 +00:00
bohu
98f2b12a2b Emulator-ATV: Increase SdkSetup HOME intent priority
Increase SdkSetup's HOME intent priority to 3, because
ATV has leanbacklauncher which uses priority 2; So that
ATV can go 'home'
bug: 28432804
Change-Id: I170c8b3fd4d3e82fd09c82e84bb8eeb32bb7c004
2016-04-28 01:47:08 +00:00
bohu
48ad503b90 Merge "Emulator: enable predexopt for some sample apps" into nyc-dev am: 4840343 am: 01297a1
am: b33917d

* commit 'b33917dc92dc6ad5e45348f198c6fc6728fe018f':
  Emulator: enable predexopt for some sample apps

Change-Id: I9c186baa30a621c5143652a21515bb9a3232baa6
2016-04-28 00:47:18 +00:00
Bo Hu
b33917dc92 Merge "Emulator: enable predexopt for some sample apps" into nyc-dev am: 4840343
am: 01297a1

* commit '01297a10f4b715230f02fc4a362bb4b741a1bdd4':
  Emulator: enable predexopt for some sample apps

Change-Id: I4d4cdab552915a232fd637db81340289ff2875d1
2016-04-28 00:33:44 +00:00
bohu
c0e9432a3e Merge "Emulator: enable predexopt for some sample apps" into nyc-dev
am: 4840343

* commit '484034351588bb9b428b18e38e6b8103b40e75ea':
  Emulator: enable predexopt for some sample apps

Change-Id: I10112a8f32d8ff95eafbeea3b2709ed1728dacff
2016-04-28 00:25:46 +00:00