Svetoslav Ganov
388d08b6e3
resolve merge conflicts of a2c1196 to master
...
Change-Id: I221f03e2cda9e677199698d492d16788c25c9e96
2016-08-31 18:02:57 -07:00
sergeyv
22ddb31dce
TextureView: clean up displaylists am: 17dd01b693 am: ac2ca87e92
...
am: bb37b7b613
2016-08-31 23:47:32 +00:00
Makoto Onuki
034de15cb6
Update CP2 javadoc am: 93d94ebac2 am: e3972019dc
...
am: e08b704cb7
2016-08-31 23:32:38 +00:00
Lorenzo Colitti
e22143e855
Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0 am: 2c535a4f7c
...
am: 98ed392cf7
2016-08-31 23:31:56 +00:00
Eino-Ville Talvala
749967cfa5
android.view.Surface: Add parceling warning am: f005f5ed88 am: 286b1a83e4
...
am: b13b6bd20e
2016-08-31 22:53:05 +00:00
Ned Burns
c8a00b2478
Add rotary encoder support to scrolling containers am: 20ad073581
...
am: dc47505734
2016-08-31 22:28:55 +00:00
Jorim Jaggi
32cbdcc8c0
resolve merge conflicts of c5bafe2 to master
...
Change-Id: I19dd5c88c664313c2f8b47d8f8fd556f630c8bf1
2016-08-31 13:51:50 -07:00
Tor Norbye
366a3f14f5
Merge "Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef"
2016-08-31 19:23:41 +00:00
TreeHugger Robot
1ae9143d7a
Merge "Do not leak usb device connection FD"
2016-08-31 18:03:12 +00:00
Tony Mak
72b817d1e6
Merge "Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner"
2016-08-31 10:16:59 +00:00
Greg Kaiser
f4d609b9c0
ContextHubService: Hack in Google vendor value am: 5817ce0c13 am: 3d2f2a4305
...
am: ee483f7d78
2016-08-31 03:04:41 +00:00
Pablo Ceballos
1209bc144b
Fail createVirtualDisplay with single-buffered Surface am: aff2f94939 am: d387b20dcb
...
am: 658f26634f
2016-08-31 02:56:35 +00:00
Svetoslav Ganov
a2c1196dc2
Properly close fd backing a MemoryIntArray am: fe2462f3a6
...
am: b7be22cdaf
2016-08-31 01:04:00 +00:00
Svetoslav Ganov
b7be22cdaf
Properly close fd backing a MemoryIntArray
...
am: fe2462f3a6
2016-08-31 00:56:32 +00:00
Adam Powell
8c52bf51a2
Fixes for ImageView drawable visibility dispatch am: 06f9eb8b62 am: fd86f7fdfd am: ee2f4d890e
...
am: 393279da8f
2016-08-31 00:54:04 +00:00
sergeyv
bb37b7b613
TextureView: clean up displaylists am: 17dd01b693
...
am: ac2ca87e92
2016-08-31 00:37:51 +00:00
Todd Kennedy
8402d225c0
Enable web action apps based on system setting am: efc1c4d501 am: 742f4de6cf
...
am: 66db34fbe2
2016-08-31 00:37:13 +00:00
sergeyv
ac2ca87e92
TextureView: clean up displaylists
...
am: 17dd01b693
2016-08-31 00:32:17 +00:00
Tor Norbye
5afebff407
Add SYSTEM_HEALTH_SERVICE to the ServiceName typedef
...
Change-Id: I65c78a079152b2c4d82f8228ca14714ffff282c5
2016-08-30 17:12:53 -07:00
Makoto Onuki
e08b704cb7
Update CP2 javadoc am: 93d94ebac2
...
am: e3972019dc
2016-08-30 22:49:57 +00:00
Makoto Onuki
e3972019dc
Update CP2 javadoc
...
am: 93d94ebac2
2016-08-30 22:42:41 +00:00
sergeyv
17dd01b693
TextureView: clean up displaylists
...
bug:31066756
Change-Id: Ibc61825ad1ed12479e9de18cc06be7401d3fc93a
2016-08-30 14:03:32 -07:00
Lorenzo Colitti
98ed392cf7
Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0
...
am: 2c535a4f7c
2016-08-30 20:32:52 +00:00
Lorenzo Colitti
2c535a4f7c
Network switch notifications: rate & daily limits am: 84e6f1232c
...
am: 858499b2c0
2016-08-30 20:24:14 +00:00
Lorenzo Colitti
858499b2c0
Network switch notifications: rate & daily limits
...
am: 84e6f1232c
2016-08-30 20:17:33 +00:00
Abodunrinwa Toki
306bcc3dd4
Merge "EditText: Proper support for "textIsSelectable"."
2016-08-30 19:04:38 +00:00
Eino-Ville Talvala
b13b6bd20e
android.view.Surface: Add parceling warning am: f005f5ed88
...
am: 286b1a83e4
2016-08-30 17:57:12 +00:00
Philip P. Moltmann
674e8c3825
Do not leak usb device connection FD
...
The native code uses mNativeContext=0 to indicate that is was already
closed and checks this properly. Hence let's leave the checking in the
native code.
We need to keep a reference in UsbRequest as otherwise the
UsbDeviceConnection might get finalized while a UsbRequest is in
progress. The UsbRequest itself makes sure that it is not garbage
collected while the I/O is in progress.
Also I added CloseGuards to make sure the classes are used properly and
fixed an error string in the native code.
Fixes: 31124312
Bug: 31021315
Change-Id: I96deb73957eba0e14e6b656988a2ae9b409bf55f
2016-08-30 10:52:39 -07:00
Eino-Ville Talvala
286b1a83e4
android.view.Surface: Add parceling warning
...
am: f005f5ed88
2016-08-30 17:50:12 +00:00
Eino-Ville Talvala
0656931d18
Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
2016-08-30 17:44:11 +00:00
Greg Kaiser
ed2a5f8592
ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf
...
am: 7fd9e40381
2016-08-30 17:20:09 +00:00
Paul Stewart
c4ec49b7b9
Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf
...
am: 163a135246
2016-08-30 17:20:02 +00:00
Tony Mak
1970f97e47
Send ACTION_DEVICE_OWNER_CHANGED broadcast after clearing device owner
...
Change-Id: Iaac182c69a30e941da3a017a923247d813881521
Fix: 27261692
2016-08-30 17:41:48 +01:00
Lorenzo Colitti
84e6f1232c
Network switch notifications: rate & daily limits
...
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.
It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.
Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
2016-08-31 00:36:11 +09:00
Jason Monk
90a788e29b
resolve merge conflicts of d70ed99 to master
...
Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a
2016-08-30 10:54:03 -04:00
Victor Chang
3f98ea1eee
Merge "forceUpdateUserSetupComplete should have no effect in user build"
2016-08-30 12:38:53 +00:00
Ned Burns
dc47505734
Add rotary encoder support to scrolling containers
...
am: 20ad073581
2016-08-30 03:14:23 +00:00
TreeHugger Robot
aa09263379
Merge "Add rotary encoder support to scrolling containers" into cw-f-dev
2016-08-30 03:10:48 +00:00
Jorim Jaggi
c5bafe26cb
Add animation when unoccluding windows (1/2) am: 6626f54e65
...
am: 314c05db45
2016-08-30 02:33:24 +00:00
Svetoslav Ganov
fe2462f3a6
Properly close fd backing a MemoryIntArray
...
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.
Bug:30310689
Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
2016-08-30 02:26:19 +00:00
Greg Kaiser
786676eb39
NanoAppFilter: Workaround HubId issues am: 3907049080 am: 41ef2a038d
...
am: d20ed26dff
2016-08-30 01:38:27 +00:00
Greg Kaiser
45cad7f70c
ContextHubManager: Fix API documentation. am: fac5be2ace am: 921e7ef350
...
am: fce14d1808
2016-08-30 01:32:36 +00:00
Greg Kaiser
974c0b6a2c
ContextHubService: Don't double report app loads am: fe6d4f518a am: ca627a8cc3
...
am: 8c94f54e0f
2016-08-30 01:26:40 +00:00
Eino-Ville Talvala
f005f5ed88
android.view.Surface: Add parceling warning
...
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.
Add a warning to avoid issues in the future
Bug: 31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
2016-08-29 17:51:23 -07:00
Mitchell Wills
722de5f9d0
DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
...
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
Mark Lu
810d3a5464
docs: Fix typo and broken link in AsyncTask.java am: 53415ff24e am: fc68813e5c
...
am: f9537d2a05
2016-08-30 00:43:55 +00:00
Mark Lu
8e701d18fa
docs: fix link in Loader reference page am: 9f52b7a4a8 am: c6612637bb
...
am: 2721e7db4a
2016-08-30 00:43:26 +00:00
The Android Automerger
f287780643
Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp
2016-08-30 00:26:21 +00:00
Jorim Jaggi
314c05db45
Add animation when unoccluding windows (1/2)
...
am: 6626f54e65
2016-08-30 00:25:52 +00:00
Ned Burns
20ad073581
Add rotary encoder support to scrolling containers
...
Change-Id: I1b7a2a60ac9864f2639af81fff810db601b2fbd4
2016-08-29 20:09:23 -04:00
