Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,094 Commits 3 Branches 0 Tags
932765b45b77c1ffdb0a4b46751caa67998bbeb7
Commit Graph

50367 Commits

Author SHA1 Message Date
Benjamin Franz
932765b45b am aa2b7910: am adb41d8f: am 01b079f7: Merge "Make ContentObservers work across profiles" into mnc-dev 
* commit 'aa2b79107918adfe2fbfc7d40dd17845b4739999':
  Make ContentObservers work across profiles
 2015-06-30 09:47:14 +00:00
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
476501875b am f2a08d05: am 49aeed9f: am 5f950417: Merge "Fix use of reachable DNS server logic" into mnc-dev 
* commit 'f2a08d054cdc301eb66c957f9ae05307d1e1f215':
  Fix use of reachable DNS server logic
 2015-06-30 07:06:06 +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
60b5cabb4c am 9958e75b: am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '9958e75b51029fca7bd130e37c5d5b3ca24e2788':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 06:12:40 +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
ee4e4e79f5 am 358a8362: am ae45cfa6: am 03b5f128: Merge "Grant default permissons to the default SMS, Phone, Browser app." into mnc-dev 
* commit '358a8362781736a8ddaa27713a0727d4eac1cfd0':
  Grant default permissons to the default SMS, Phone, Browser app.
 2015-06-30 01:22:42 +00: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
d3e57ba2a5 am 5d574062: am 1d4419e3: am e85da2ba: Add accessibility event for assist disclosure 
* commit '5d5740626b907aaa85049c2ac95e823d81d3262a':
  Add accessibility event for assist disclosure
 2015-06-30 01:05:02 +00:00
Jorim Jaggi
a8a1877e78 am 9788eb83: am 778dccb8: am 825c2a00: Merge "Add setting to disable screenshot separately (1/2)" into mnc-dev 
* commit '9788eb83d69ac3000d88af50b11d777951a55f41':
  Add setting to disable screenshot separately (1/2)
 2015-06-30 01:04:57 +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
Christopher Tate
510ac7fcf0 am c2487836: am 46a23872: am c4c239bf: Merge "Don\'t crash in JNI: add DeadObjectException(String msg) ctor" into mnc-dev 
* commit 'c2487836618e93e0e2e6f1ca42670ebb73e5c629':
  Don't crash in JNI: add DeadObjectException(String msg) ctor
 2015-06-30 00:25:49 +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
cf3a3e1272 am 1537e135: am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '1537e1358ea8446a1a512f1a15244355acda6d1a':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:17:49 +00: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
2f37bd3921 am d1d1a700: am 64c0c4da: am 6fd49936: Merge "Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING" into mnc-dev 
* commit 'd1d1a700501242cca06b5729c2bd888d6f2d4d52':
  Rename ALLOW_PARENT_APP_LINKING to ALLOW_PARENT_PROFILE_APP_LINKING
 2015-06-29 17:41:26 +00:00
Kenny Guy
516dfbe39f am 45dab52c: am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '45dab52ce84b4ecc6461260a28f1a8f72158be9f':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 17:26:01 +00:00
Craig Lafayette
6cdad1244d am 8a42356c: am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '8a42356c21435ee502efc925f70389a0c0024118':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 17:25:53 +00:00
Kenny Guy
0c5877f07b am 24863e12: am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '24863e12e51ecf3acb395f0036bbed8b27e23978':
  Deprecate APIs for admin to create users.
 2015-06-29 17:25:46 +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
94a20a2efd resolved conflicts for merge of 31706d99 to master 
Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b
 2015-06-29 17:39:31 +01: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
9c51187219 am 994d33c4: am 5cf3d76e: am 1ea7a819: Merge "Fix crash with engines that don\'t override getVoices()." into mnc-dev 
* commit '994d33c4bef8bb2e668694cfc95f327f5332995f':
  Fix crash with engines that don't override getVoices().
 2015-06-29 10:06:57 +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
b1efe967ba am 45034326: am a7c725f2: am e96b1c6f: Merge "Fix crash due to reverse selection." into mnc-dev 
* commit '450343261eaed2c5f5c83ed7ea31d570cf73569b':
  Fix crash due to reverse selection.
 2015-06-29 03:36:46 +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