Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,320 Commits 3 Branches 0 Tags
aa2b79107918adfe2fbfc7d40dd17845b4739999
Commit Graph

49557 Commits

Author SHA1 Message Date
Benjamin Franz
aa2b791079 am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev 
* commit 'adb41d8f6cfb2f33240c11cc6850994579952ea1':
  Make ContentObservers work across profiles
 2015-06-30 08:00:48 +00:00
Benjamin Franz
01b079f7d2 Merge "Make ContentObservers work across profiles" into mnc-dev 2015-06-30 07:45:50 +00:00
Erik Kline
f2a08d054c am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev 
* commit '49aeed9f3fe7d8e7af2fff549587546dfe4361d1':
  Fix use of reachable DNS server logic
 2015-06-30 06:55:42 +00:00
Erik Kline
5f950417f6 Merge "Fix use of reachable DNS server logic" into mnc-dev 2015-06-30 06:32:23 +00:00
Andreas Gampe
9958e75b51 am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 05:58:53 +00:00
Andreas Gampe
6feb4301eb Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 2015-06-30 05:40:08 +00:00
Andreas Gampe
373fb40947 Frameworks/base: Remove UsageEvents finalizer 
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.

Bug: 22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
 2015-06-29 22:07:30 -07:00
Erik Kline
b36a3131d1 Fix use of reachable DNS server logic 
Move reachable DNS server computation out of ConnectivityService
and split it into LinkProperties#isReachable() and a companion
change in WifiStateMachine's makeLinkProperties().

Restore previous ConnectivityService#updateDnses() behaviour, as
the pruning is done in WifiStateMachine now.

Bug: 19470192
Bug: 20733156
Bug: 22098233
Change-Id: I810ef74d504e5dc1ca2017d435cdadd6b82171e6
 2015-06-30 12:12:37 +09:00
Svetoslav
358a836278 am ae45cfa6: am 03b5f128: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev 
* commit 'ae45cfa632b4bce14b59c874596f6b076e68402d':
  Grant default permissons to the default SMS, Phone, Browser app.
 2015-06-30 01:07:52 +00:00
Jorim Jaggi
5d5740626b am 1d4419e3: am e85da2ba: Add accessibility event for assist disclosure 
* commit '1d4419e3c2067151baa9010f8bda98653c43cfc8':
  Add accessibility event for assist disclosure
 2015-06-30 00:49:35 +00:00
Jorim Jaggi
9788eb83d6 am 778dccb8: am 825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev 
* commit '778dccb865f5fbc6e6124009e343c9b5b6be87a8':
  Add setting to disable screenshot separately (1/2)
 2015-06-30 00:49:30 +00:00
Svetoslav
03b5f128db Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev 2015-06-30 00:49:16 +00:00
Svetoslav
cdfd230a39 Grant default permissons to the default SMS, Phone, Browser app. 
The default SMS, Phone, Browser are selected in the UI and we
grant default permissions to these. We do this regardless if
they are on the system image as the user has made an explicit
choice in the UI and the permission we grant are considered
essential for such type of a core app to operate properly.

bug:22104986

Change-Id: Ide8caeb524b43dde11a20460666cf34c4d35f84b
 2015-06-29 17:44:19 -07:00
Jorim Jaggi
e85da2bad5 Add accessibility event for assist disclosure 
Bug: 21568059
Change-Id: Ib51d4236fcc87acd54cb5d191197b9b2c6cc54ea
 2015-06-30 00:27:14 +00:00
Jorim Jaggi
825c2a006e Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev 2015-06-30 00:24:38 +00:00
Jorim Jaggi
a133f0b522 Add setting to disable screenshot separately (1/2) 
Bug: 22063668
Change-Id: Ief704004a8ab0a65d34753f9098003ba695726df
 2015-06-29 17:16:33 -07:00
Christopher Tate
c248783661 am 46a23872: am c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev 
* commit '46a2387239d186d34cd9681bd404f03dfab67558':
  Don't crash in JNI: add DeadObjectException(String msg) ctor
 2015-06-30 00:10:26 +00:00
Christopher Tate
e56db0e3fa Don't crash in JNI: add DeadObjectException(String msg) ctor 
Bug 22104446

Change-Id: I0a538119269fe45955130e4e3d0d0bae8ee64993
 2015-06-29 16:04:57 -07:00
Alan Viverette
1537e1358e am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:04:39 +00:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
Nicolas Prevot
d1d1a70050 am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit '64c0c4da555f6d38b9c2516f855b49e6b501b783':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:25:10 +00:00
Nicolas Prevot
6fd49936ae Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 2015-06-29 17:08:34 +00:00
Benjamin Franz
adea1918be Make ContentObservers work across profiles 
Currently registering for changes to a cross-user Uri does not work, as
the calling user id is used to identify the Uri. Change this to use the
userId the Uri is associated with. In order to protect Uris across
users, we only allow registration for a Uri when the caller has read
permission. We also only allow notify calls from across users when the
caller has write permission to the Uri.

Bug: 19312280
Change-Id: Ide216b09980ed5ebefe9b37c946dd8160167809f
 2015-06-29 16:17:55 +01:00
Kenny Guy
45dab52ce8 am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '9aa0c4811097e7754cde0340dfcc32044a7caf7d':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 13:58:13 +00:00
Craig Lafayette
8a42356c21 am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '5c708248c32f1a667ea3d49cf6ace28b5d29afd1':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 13:57:56 +00:00
Kenny Guy
24863e12e5 am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '2c594b214977221773b447bd4cfefb5187911f10':
  Deprecate APIs for admin to create users.
 2015-06-29 13:57:50 +00:00
Benjamin Franz
31706d9921 am 635e4ffc: am b6fb3fe8: Merge "Block assist when screenshots are disabled by policy" into mnc-dev 
* commit '635e4ffcf65bef9cde34a62583ee6dac49cb2592':
  Block assist when screenshots are disabled by policy
 2015-06-29 13:57:33 +00:00
Kenny Guy
43904fd5b7 Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 2015-06-29 13:28:54 +00:00
Kenny Guy
2703a13f11 Revert "Deprecate APIs for admin to create users." 
This reverts commit ea864c4d4d.

Change-Id: I827e6364b61eeb9e1b2d3205b5e93e10b1df4bfe
 2015-06-29 13:24:24 +00:00
Craig Lafayette
bee7245c69 Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 2015-06-29 12:48:21 +00:00
Kenny Guy
01056b3662 Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-29 12:42:21 +00:00
Benjamin Franz
b6fb3fe8f4 Merge "Block assist when screenshots are disabled by policy" into mnc-dev 2015-06-29 10:29:23 +00:00
Niels Egberts
994d33c4be am 5cf3d76e: am 1ea7a819: Merge "Fix crash with engines that don\'t override getVoices()." into mnc-dev 
* commit '5cf3d76e98172f8bf2fc02fa5dbf028c07747c60':
  Fix crash with engines that don't override getVoices().
 2015-06-29 09:56:35 +00:00
Niels Egberts
1ea7a81931 Merge "Fix crash with engines that don't override getVoices()." into mnc-dev 2015-06-29 09:34:44 +00:00
Seigo Nonaka
450343261e am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev 
* commit 'a7c725f2f3e3b7df1923033555a845bfb6a936f9':
  Fix crash due to reverse selection.
 2015-06-29 03:25:19 +00:00
Seigo Nonaka
e96b1c6f82 Merge "Fix crash due to reverse selection." into mnc-dev 2015-06-29 03:02:45 +00:00
Christopher Tate
de3d02e4c3 am e436e19e: am b035c6d9: Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 
* commit 'e436e19e0f40defcac3265efcc40eb355de06846':
  Properly scope the "only http/https schemes" intent filter semantics
 2015-06-27 01:05:16 +00:00
Dianne Hackborn
c063f1cf50 am 97abd672: am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev 
* commit '97abd672aaa041c34542d8bbededbe207798baee':
  Looks like MNC is gonna be API 23.
 2015-06-27 00:54:25 +00:00
Christopher Tate
b035c6d9a6 Merge "Properly scope the "only http/https schemes" intent filter semantics" into mnc-dev 2015-06-27 00:48:10 +00:00
Christopher Tate
2134744efd Properly scope the "only http/https schemes" intent filter semantics 
That restriction applies only to default-app linkage verification, and
not to any general questions of "is this app effectively a web browser?"

Bug 21688029

Change-Id: I9f6a7bc6dcac5e12ee07f8da6465ad51c1aeddfb
 2015-06-26 17:45:22 -07:00
Dianne Hackborn
d5f387bc5f Merge "Looks like MNC is gonna be API 23." into mnc-dev 2015-06-27 00:29:26 +00:00
Dianne Hackborn
2e5cad7868 Looks like MNC is gonna be API 23. 
Change-Id: I9c9c62209c949b1a16ed53eafc259e88e2ddb69a
 2015-06-26 16:15:55 -07:00
Robert Greenwalt
07fae068d3 am b3fcf1af: am ae3584bd: Merge "Add Validation logging." into mnc-dev 
* commit 'b3fcf1afcb6856182dea8b7ae128f4232473e35c':
  Add Validation logging.
 2015-06-26 22:55:03 +00:00
Mady Mellor
51673142ae am 9ebbbf10: am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev 
* commit '9ebbbf107077a7de30491fbaa3b4a2ab9b826775':
  Text selection: fix snapping to words when words break across lines
 2015-06-26 22:54:57 +00:00
Rubin Xu
ba5c07286f am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 
* commit 'd1858a7d3e648f6c7382bba5bd3982a7ecc15257':
  Use StorageManager.wipeAdoptableDisks to wipe external disks
 2015-06-26 22:54:50 +00:00
Abodunrinwa Toki
9508d8738e am e02ee117: am 1223a75a: Merge "TextView: add the "Share" accessibility action." into mnc-dev 
* commit 'e02ee117ed14fd76dcbe4ee9d519c15f13d05a9d':
  TextView: add the "Share" accessibility action.
 2015-06-26 22:54:45 +00:00
Robert Greenwalt
ae3584bd8d Merge "Add Validation logging." into mnc-dev 2015-06-26 22:40:31 +00:00
Mady Mellor
11b64410d9 Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev 2015-06-26 22:36:44 +00:00
Rubin Xu
0a202eac01 Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 2015-06-26 22:36:13 +00:00
Chien-Yu Chen
4997948c7c am c9a7b419: am f09fd213: Merge "Camera2: Remove references to sync.frameNumber" into mnc-dev 
* commit 'c9a7b41967beaea497fe24d5d1015546697c8d74':
  Camera2: Remove references to sync.frameNumber
 2015-06-26 22:33:35 +00:00