drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,785 Commits 1 Branch 0 Tags
Commit Graph

201785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
7e1d841d63 Import translations. DO NOT MERGE 
Change-Id: Ib804ad4db26e8029d8c55ccda9046273baf93de3
Auto-generated-cl: translation import
 2015-10-21 09:45:23 -07:00
Paul Lawrence
8deb694779 Merge branch 'cw-e-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into cw-e-dev 2015-10-21 14:53:48 +00:00
Paul Lawrence
29c5fb2646 Merge "Don\'t include password on default encryption command" into mnc-dr-dev 
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
 2015-10-21 14:53:23 +00:00
Paul Lawrence
3379409c67 Merge "Don\'t include password on default encryption command" into mnc-dr-dev 
am: 68521fd7ce

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command
 2015-10-21 14:50:51 +00:00
Geoff Mendal
c37fe84736 Import translations. DO NOT MERGE 
am: fde4111eea  -s ours

* commit 'fde4111eea4b92fbc10c9d6da7eaaa349292d9ec':
  Import translations. DO NOT MERGE
 2015-10-21 14:49:03 +00:00
Paul Lawrence
68521fd7ce Merge "Don't include password on default encryption command" into mnc-dr-dev 2015-10-21 14:27:33 +00:00
Geoff Mendal
fde4111eea Import translations. DO NOT MERGE 
Change-Id: I03353dbedeb1204ce7cd07577257aa070ce19b2f
Auto-generated-cl: translation import
 2015-10-21 07:18:52 -07:00
Geoff Mendal
0705d75d69 Import translations. DO NOT MERGE 
Change-Id: Idaba78408b31b9161ac35fbcf940266b491ee296
Auto-generated-cl: translation import
 2015-10-21 05:14:07 -07:00
Lorenzo Colitti
5c09f31e49 Merge "Don\'t buzz when automatically connecting to captive portals" into mnc-dr-dev 
am: d214496319

* commit 'd214496319785311f99f8415b7c8be3189420488':
  Don't buzz when automatically connecting to captive portals
 2015-10-21 01:15:27 +00:00
Lorenzo Colitti
d214496319 Merge "Don't buzz when automatically connecting to captive portals" into mnc-dr-dev 2015-10-21 01:10:10 +00:00
Lorenzo Colitti
46d50b708d Don't buzz when automatically connecting to captive portals 
Play a sound and vibrate (by setting DEFAULT_ALL) only if the
user manually selected the network. This applies to both captive
portals and networks with no Internet access.

Bug: 24126143
Change-Id: Idf075d5c85f9f4b07a3431a25d1a3f7089cf1ee2
 2015-10-21 09:59:31 +09:00
Jeff Sharkey
257d2ca7fd Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.
 2015-10-21 00:55:05 +00:00
Jeff Sharkey
55d2b6e8e6 Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev 2015-10-21 00:48:47 +00:00
Pavel Zhamaitsiak
d91b1f6bb8 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev 
am: d99aade6e2

* commit 'd99aade6e2c001cbb8e32c9342f20404bd614443':
  Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag
 2015-10-21 00:32:10 +00:00
Jeff Sharkey
bbcb331205 Correctly derive ABI for apps on adopted media. 
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation.  This
change fixes the issue by copying the volume UUID into place early
in the scanning process.

Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.

Bug: 24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
 2015-10-20 17:32:05 -07:00
Pavel Zhamaitsiak
d99aade6e2 Merge "Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag" into mnc-dr-dev 2015-10-21 00:27:27 +00:00
Rob Carr
894dd2b078 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 
am: 9ada400e98

* commit '9ada400e98451d3ff39ea284be5c205c8c8a3f95':
  Catch exceptions thrown by pending activity launches.
 2015-10-20 23:51:23 +00:00
Rob Carr
9ada400e98 Merge "Catch exceptions thrown by pending activity launches." into mnc-dr-dev 2015-10-20 23:30:12 +00:00
Pavel Zhamaitsiak
b4faf348f1 Carrier Config: Add KEY_CARRIER_IMS_GBA_REQUIRED_BOOL flag 
Bug: 23731243
Change-Id: I3e08469ef293f0b619f95dd9fb48e8c582926270
 2015-10-20 23:28:12 +00:00
Kevin Cernekee
d166333eb5 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 
am: 3554d62ca0

* commit '3554d62ca02bf6bc7777d1b22699876ec388fe6c':
  ignore initial request to disable iptable chain
 2015-10-20 22:18:22 +00:00
Matthew Williams
07de80bd87 Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 
am: cf43b5523f

* commit 'cf43b5523fd12fdc69ea25cb6dbf5e95724927ec':
  DO NOT MERGE Race condition in JobServiceContext
 2015-10-20 22:15:36 +00:00
Kevin Cernekee
3554d62ca0 Merge "ignore initial request to disable iptable chain" into mnc-dr-dev 2015-10-20 22:11:29 +00:00
Matthew Williams
cf43b5523f Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev 2015-10-20 22:03:17 +00:00
Alan Viverette
ac02be311d Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 
am: 4823493647

* commit '482349364715dfcd87dc83e0913fc60dc6df0497':
  DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure
 2015-10-20 21:56:40 +00:00
Robert Carr
f1ddb5e090 Catch exceptions thrown by pending activity launches. 
When we perform pendign activity launches from the handler
thread (as opposed to the a client binder thread), we must
take care exceptions from such will not bring the system
server down.

Bug: 24983901
Change-Id: I0e75f6b51bf6172a8e1b9cccc5fffb9d50c63e30
 2015-10-20 21:51:26 +00:00
Alan Viverette
4823493647 Merge "DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure" into mnc-dr-dev 2015-10-20 21:44:35 +00:00
Matthew Williams
f5e045254a DO NOT MERGE Race condition in JobServiceContext 
BUG: 23981171
JobServiceContext has a reference to the running job which
1) needs to be copied before providing access to outside callers
2) was not guarded by a lock in one case which might result in an NPE

Change-Id: I7eb04052f3fe63e7b386c564a6bdebf9144e976a
(cherry picked from commit 0cc7654e109d232e5d9a9de06482d8d349a21f28)
 2015-10-20 21:44:26 +00:00
Alan Viverette
b5817779a9 DO NOT MERGE Use correct param for heightMode in RelativeLayout horizontal measure 
Bug: 22824701
Bug: 25107144
Change-Id: Ia0afd3edc20b8127605aef2653fa9b5472f41be2
(cherry picked from commit 130ce740d1aa4b9a7b024c76f8adec2c24278a81)
 2015-10-20 17:29:39 -04:00
Xiaohui Chen
690f18a564 ignore initial request to disable iptable chain 
iptable child chains are disabled by default.  Ignore the initial
disable request so netd won't throw errors when it cannot detach chains
that do not exist.

Bug: 22800189
Change-Id: I70b4b8b9e6a5dbffe32841941922b7fd92dcd3d6
Original-Change-Id: I9312dd558ba6d59dc6aa394afeb66a222daafcf9
[cernekee: backported from master branch]
 2015-10-20 13:55:33 -07:00
Matthew Williams
cb937cbc6a DO NOT MERGE Sync extras bundle comparison can throw NPE 
am: 7d7a2254bc

* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
  DO NOT MERGE Sync extras bundle comparison can throw NPE
 2015-10-20 20:42:07 +00:00
Matthew Williams
7d7a2254bc DO NOT MERGE Sync extras bundle comparison can throw NPE 
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
 2015-10-20 18:55:30 +00:00
Rob Carr
e2a49862c1 Merge "Correct ActivityInfo constructors." into mnc-dr-dev 
am: cfea184d6c

* commit 'cfea184d6c0268b92ed55276d2b686962c8ee531':
  Correct ActivityInfo constructors.
 2015-10-20 18:33:58 +00:00
Rob Carr
cfea184d6c Merge "Correct ActivityInfo constructors." into mnc-dr-dev 2015-10-20 18:20:27 +00:00
Abodunrinwa Toki
9e97c20ed9 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev 
am: 3bd3655fd0

* commit '3bd3655fd05a548f6e60cfccd4185a4b9ae2a7d6':
  Re-set PROCESS_TEXT selection if nothing was returned.
 2015-10-20 18:06:44 +00:00
Robert Carr
8ab115a9aa Correct ActivityInfo constructors. 
ActivityInfo was missing initialization for the
documentLaunchMode flag in the copy-constructor
and the Parcel constructor. The copy-constructor
is used in multi-user/profile mode to create a
seperate instance of the ActivityInfo per uid
and this was manifesting in the linked bug.

Bug: 21590916
Change-Id: I6f71d94ec32ec6326d23c9b62e9d8d319e2fa25e
(cherry picked from commit 3e2e0117858eb02fef55ca4c245e8b920aedc6eb)
 2015-10-20 17:48:11 +00:00
Abodunrinwa Toki
3bd3655fd0 Merge "Re-set PROCESS_TEXT selection if nothing was returned." into mnc-dr-dev 2015-10-20 17:47:28 +00:00
Jeff Sharkey
3e9a3f3b71 Merge "Add locking when mutating RecentTasks." into mnc-dr-dev 
am: 1a4efb77dd

* commit '1a4efb77dd3c503634f1f6495d931d1a570f51f5':
  Add locking when mutating RecentTasks.
 2015-10-20 17:33:57 +00:00
Jeff Sharkey
5d7604323f Merge "Ignore network policies with missing IMSI." into mnc-dr-dev 
am: 38463bb950

* commit '38463bb950390a7b50fb07a990d9ed6990d07539':
  Ignore network policies with missing IMSI.
 2015-10-20 17:32:57 +00:00
Alan Viverette
e3d745291e Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev 
am: 840f38905c

* commit '840f38905c073044077cb2bef68d20971f5d3d39':
  Update drawable matrix when bounds change in invalidateDrawable()
 2015-10-20 17:24:45 +00:00
George Mount
ee15f087db Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev 
am: 1313020acc

* commit '1313020acc93e601c98779d8859f44391c504ba2':
  Set the bounds on the drawable for ChangeBounds reparenting.
 2015-10-20 17:23:45 +00:00
Jeff Sharkey
1a4efb77dd Merge "Add locking when mutating RecentTasks." into mnc-dr-dev 2015-10-20 17:22:27 +00:00
Jeff Sharkey
38463bb950 Merge "Ignore network policies with missing IMSI." into mnc-dr-dev 2015-10-20 17:21:46 +00:00
Alan Viverette
840f38905c Merge "Update drawable matrix when bounds change in invalidateDrawable()" into mnc-dr-dev 2015-10-20 16:54:12 +00:00
George Mount
1313020acc Merge "Set the bounds on the drawable for ChangeBounds reparenting." into mnc-dr-dev 2015-10-20 16:41:33 +00:00
Abodunrinwa Toki
3b8a5ea036 Re-set PROCESS_TEXT selection if nothing was returned. 
Bug: 25043887
Change-Id: If069a5e23f1adf6a2c3aac8fe7e3f19cff2e28ad
 2015-10-20 17:11:26 +01:00
Michael Wright
bab2b42445 resolve merge conflicts of 57a5cba606 to cw-e-dev. 
Change-Id: Ib43f0cf0b285c9799239658859af735279f87fff
 2015-10-20 17:06:27 +01:00
Michael Wright
57a5cba606 Merge "Add SystemUI component to watch for keyboard attachment." into mnc-dr-dev 2015-10-20 15:31:01 +00:00
Todd Kennedy
6320767fb1 Merge "Retain fragment loaders" into mnc-dr-dev 
am: ad968cf4e5

* commit 'ad968cf4e55afdd897ea84a44b7450442aea1e1d':
  Retain fragment loaders
 2015-10-20 14:41:23 +00:00
Todd Kennedy
ad968cf4e5 Merge "Retain fragment loaders" into mnc-dr-dev 2015-10-20 14:36:00 +00:00
Alan Viverette
01320de844 Update drawable matrix when bounds change in invalidateDrawable() 
Bug: 24797872
Change-Id: Ib2bcce6f7d6fab33633a915882821b00d94e4e44
 2015-10-20 13:51:21 +00:00