Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
240,028 Commits 3 Branches 0 Tags
4f69fe3cf5bfaa3a7d80db7ecde199be7a40c2cd
Commit Graph

57181 Commits

Author SHA1 Message Date
Jeff Sharkey
4f69fe3cf5 Merge "Remove references to Google packages." into nyc-dev am: 215fe69 
am: cfe811f

* commit 'cfe811f936eff449bf212b6aa87417e8c50349b5':
  Remove references to Google packages.
 2016-03-17 18:54:31 +00:00
Jeff Sharkey
7029a23b38 Merge "Defuse Bundles parsed by the system process." into nyc-dev am: c4b0ade 
am: a0f6318

* commit 'a0f6318f44244ec4e916d3abecf157beb4fefc8c':
  Defuse Bundles parsed by the system process.
 2016-03-17 18:54:28 +00:00
Jeff Sharkey
cfe811f936 Merge "Remove references to Google packages." into nyc-dev 
am: 215fe69

* commit '215fe69342dcd567299414e26a89bb7d5c3e7185':
  Remove references to Google packages.
 2016-03-17 17:35:07 +00:00
Jeff Sharkey
a0f6318f44 Merge "Defuse Bundles parsed by the system process." into nyc-dev 
am: c4b0ade

* commit 'c4b0ade245fcf6546ac722ac9ce6ddd30b473e68':
  Defuse Bundles parsed by the system process.
 2016-03-17 17:35:04 +00:00
Jeff Sharkey
215fe69342 Merge "Remove references to Google packages." into nyc-dev 2016-03-16 20:55:48 +00:00
Jeff Sharkey
237db27c58 Remove references to Google packages. 
Bug: 26441633
Change-Id: Iba6566215e2b6d224fd3b9c11d086f5c2db87dca
 2016-03-16 14:54:09 -06:00
Jeff Sharkey
c4b0ade245 Merge "Defuse Bundles parsed by the system process." into nyc-dev 2016-03-16 20:52:05 +00:00
Jeff Sharkey
d136e51a99 Defuse Bundles parsed by the system process. 
It's easy for apps to throw custom Parcelables into Bundles, but
if the system tries peeking inside one of these Bundles, it triggers
a BadParcelableException.  If that Bundle was passed away from the
Binder thread that delivered it into the system, we end up with a
nasty runtime restart.

This change mitigates this trouble by "defusing" any Bundles parsed by
the system server.  That is, if it encounters BadParcelableException
while unpacking a Bundle, it logs and delivers an empty Bundle as
the result.

Simultaneously, to help catch the system process sticking its
fingers into Bundles that are destined for other processes, a Bundle
now tracks if it's "defusable."  For example, any Intents delivered
through ActivityThread are marked as being defusable, since they've
arrived at their final destination.  Any other Bundles are considered
to be "in transit" and we log if the system tries unparceling them.

Merges several Parcel boolean fields into a flags int.  Add better
docs to several classes.

Bug: 27581063
Change-Id: I28cf3e7439503b5dc9a429bafae5eb48f21f0d93
 2016-03-16 14:45:26 -06:00
Michael Wright
f99e5df8b0 Merge "DO NOT MERGE Fix conditional when checking for confirm key." into nyc-dev 
am: f1f8bfb

* commit 'f1f8bfb76448496ce5056f101d1d40a35167a964':
  DO NOT MERGE Fix conditional when checking for confirm key.
 2016-03-16 20:30:40 +00:00
Yigit Boyar
f1f8bfb764 Merge "DO NOT MERGE Fix conditional when checking for confirm key." into nyc-dev 2016-03-16 20:27:21 +00:00
Peng Xu
d09075e54a Merge "Fix NC caused by race condition in SystemSensorManager" into nyc-dev am: 83d0078 
am: 237bbfa

* commit '237bbfa446d9d1c63de5627f575e4800b42ca461':
  Fix NC caused by race condition in SystemSensorManager
 2016-03-16 19:37:58 +00:00
Peng Xu
237bbfa446 Merge "Fix NC caused by race condition in SystemSensorManager" into nyc-dev 
am: 83d0078

* commit '83d0078f9571b3967ba73ca3651c60d55cd4096c':
  Fix NC caused by race condition in SystemSensorManager
 2016-03-16 19:35:45 +00:00
Peng Xu
83d0078f95 Merge "Fix NC caused by race condition in SystemSensorManager" into nyc-dev 2016-03-16 19:30:55 +00:00
Peng Xu
aa957274e7 Fix NC caused by race condition in SystemSensorManager 
This change fixes a race condition when two SystemSensorManager
instances are initialized the same time.

Bug: 27334914
Change-Id: I7a886abcbff2ed6f8abf87556a78d1a4afb71f91
 2016-03-16 17:46:59 +00:00
Peng Xu
9f09d21b00 Merge "Exposing Context Hub service." into nyc-dev am: ac329d3 
am: f3882c8

* commit 'f3882c8633edafbc072713033627582934491b32':
  Exposing Context Hub service.
 2016-03-16 17:30:38 +00:00
Peng Xu
f3882c8633 Merge "Exposing Context Hub service." into nyc-dev 
am: ac329d3

* commit 'ac329d3e34e99e10243906d32cc4e36c626ac8ee':
  Exposing Context Hub service.
 2016-03-16 17:28:16 +00:00
Ashutosh Joshi
ac329d3e34 Merge "Exposing Context Hub service." into nyc-dev 2016-03-16 17:21:33 +00:00
Anna Galusza
447a103542 Merge "Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687" into nyc-dev am: bc28494 
am: 0a2d737

* commit '0a2d73721a560a5f68d137d4bed3e5700375aae4':
  Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687
 2016-03-16 17:14:43 +00:00
Anna Galusza
0a2d73721a Merge "Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687" into nyc-dev 
am: bc28494

* commit 'bc2849449b3478d71cae34a069f07c70b747bbb8':
  Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687
 2016-03-16 17:12:26 +00:00
Anna Galusza
bc2849449b Merge "Remove Intent to start screen reader tutorial. Reverts ag/867242. Bug: 27218687" into nyc-dev 2016-03-16 17:07:49 +00:00
Julia Reynolds
2de0733190 Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev am: af56824 
am: 0fb0f9a

* commit '0fb0f9a7a6f0b051b976c01c3dcf21b92bacd059':
  Prevent apps without DND access from toggling DND via AudioService.
 2016-03-16 16:55:12 +00:00
Julia Reynolds
0fb0f9a7a6 Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev 
am: af56824

* commit 'af56824e35341f46418c39e47b6855223a446c63':
  Prevent apps without DND access from toggling DND via AudioService.
 2016-03-16 16:53:02 +00:00
Julia Reynolds
af56824e35 Merge "Prevent apps without DND access from toggling DND via AudioService." into nyc-dev 2016-03-16 16:48:33 +00:00
Esteban Talavera
4a23dd030a Merge "Clarified documentation as requested by API review" into nyc-dev am: 5fbfa1b 
am: b9a69c6

* commit 'b9a69c622b727e662d419815c2e091a7a47d2c0d':
  Clarified documentation as requested by API review
 2016-03-16 14:30:09 +00:00
Esteban Talavera
b9a69c622b Merge "Clarified documentation as requested by API review" into nyc-dev 
am: 5fbfa1b

* commit '5fbfa1b0d203296d624f9c2317c309c0e02b468e':
  Clarified documentation as requested by API review
 2016-03-16 14:27:50 +00:00
Esteban Talavera
5fbfa1b0d2 Merge "Clarified documentation as requested by API review" into nyc-dev 2016-03-16 14:24:40 +00:00
Julia Reynolds
48034f89b7 Prevent apps without DND access from toggling DND via AudioService. 
Bug: 25395278
Change-Id: Id72830607b01a43848d1261292e5835315ef70d0
 2016-03-16 09:33:02 -04:00
Nicolas Prevot
36ac3b8692 Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev am: c25c903 
am: 5490ba7

* commit '5490ba72794906a1b70d631cf71e6afd4d5836f4':
  Update documentation of DevicePolicyManager.isProvisioningAllowed.
 2016-03-16 12:12:50 +00:00
Nicolas Prevot
5490ba7279 Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev 
am: c25c903

* commit 'c25c9032ffdca20a4080db5a1fe1e771af9256f6':
  Update documentation of DevicePolicyManager.isProvisioningAllowed.
 2016-03-16 12:10:27 +00:00
Nicolas Prévot
c25c9032ff Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev 2016-03-16 12:05:35 +00:00
Esteban Talavera
96895cae3e Clarified documentation as requested by API review 
Bug: 27532433
Change-Id: I5fada6c0a4636528393308d5ce098cd0398e5ff5
 2016-03-16 12:00:40 +00:00
Tony Mak
611bff36f8 Fix NotificationListenerService fail to mirror work notification am: 4dc008c 
am: 63dbf9c

* commit '63dbf9c2165ae7963d857e396237864ebceab3ee':
  Fix NotificationListenerService fail to mirror work notification
 2016-03-16 11:30:57 +00:00
Tony Mak
63dbf9c216 Fix NotificationListenerService fail to mirror work notification 
am: 4dc008c

* commit '4dc008cda2980fabb6acbf8a3b7096d1090ee36f':
  Fix NotificationListenerService fail to mirror work notification
 2016-03-16 11:28:35 +00:00
Tony Mak
4dc008cda2 Fix NotificationListenerService fail to mirror work notification 
1. Instead of getting application info in runtime, just retrieve the
   one in the context to avoid cross user operation.

2. Functions in PackageManager that retrieve badged icon now return
   badged icon if the targer user is managed profile instead of checking
   whether target user is a managed profile of the user in mContext.

3. Relax the restriction of getUserInfo, if the caller is asking a user
   in the same profile group or having the manage user permission, we let
   it go.

Bug: 26469166

Change-Id: Ia1ffc5743f7d94bd489cdb7571eaed51499ebdd9
 2016-03-16 10:49:02 +00:00
Tomasz Mikolajewski
db38235fd3 Update docs for ACTION_QUICK_VIEW. am: fe023137d0 
am: 08caebb5d1

* commit '08caebb5d1f7ecfba9f9b41f8f3621f03c79485b':
  Update docs for ACTION_QUICK_VIEW.
 2016-03-16 02:16:53 +00:00
Tomasz Mikolajewski
08caebb5d1 Update docs for ACTION_QUICK_VIEW. 
am: fe023137d0

* commit 'fe023137d0b33e30d0428132e6212ea4d0df8b5c':
  Update docs for ACTION_QUICK_VIEW.
 2016-03-16 02:14:28 +00:00
Tomasz Mikolajewski
fe023137d0 Update docs for ACTION_QUICK_VIEW. 
Bug: 27531273
Change-Id: I917ca16c14db20e6a2773018e00a61ff5fcf7ecd
 2016-03-16 02:08:53 +00:00
Steve McKay
726001b604 Merge "Add FLAG_PARTIAL. Partial files can\'t be copied." into nyc-dev am: 709be25f04 
am: 5abf7de9bd

* commit '5abf7de9bdf74a690262df4bb325e9bdb6385d1b':
  Add FLAG_PARTIAL. Partial files can't be copied.
 2016-03-16 01:43:34 +00:00
Steve McKay
5abf7de9bd Merge "Add FLAG_PARTIAL. Partial files can\'t be copied." into nyc-dev 
am: 709be25f04

* commit '709be25f04fd390b220eec1c0f5578df3be2b17e':
  Add FLAG_PARTIAL. Partial files can't be copied.
 2016-03-16 01:41:13 +00:00
Steve McKay
709be25f04 Merge "Add FLAG_PARTIAL. Partial files can't be copied." into nyc-dev 2016-03-16 01:37:08 +00:00
Adam Powell
10ab3feec8 Merge "Add View#onVisibilityAggregated" into nyc-dev am: 3c8702dd81 
am: c3b1f35153

* commit 'c3b1f35153fd66e35293e90afba32313db509b00':
  Add View#onVisibilityAggregated
 2016-03-16 00:31:56 +00:00
Adam Powell
c3b1f35153 Merge "Add View#onVisibilityAggregated" into nyc-dev 
am: 3c8702dd81

* commit '3c8702dd8113a780e6fd7240d8dfe8e82aaa283e':
  Add View#onVisibilityAggregated
 2016-03-16 00:24:59 +00:00
Adam Powell
3c8702dd81 Merge "Add View#onVisibilityAggregated" into nyc-dev 2016-03-16 00:22:22 +00:00
Michael Wright
759f9fed70 DO NOT MERGE Fix conditional when checking for confirm key. 
Bug: 26914975
Bug: 27599828
Change-Id: I1641a44e860901d2aab83138e47af6dad3ad87b1
(cherry picked from commit 6cbdc339ce)
 2016-03-16 00:09:19 +00:00
Steve McKay
168e464812 Add FLAG_PARTIAL. Partial files can't be copied. 
This allows us to exclude in-progress downloads from copy.
Will update Downloads in a followup CL to flag active downloads.

Bug: 27526321
Change-Id: I50d1db5cfb69bc6b47e10cc0f520a51e3d3cb43e
 2016-03-15 16:51:23 -07:00
Joseph Pirozzo
2d738af372 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev am: d91859d246 
am: f12a22cd53

* commit 'f12a22cd538844afa5fc5ed809febe2c4e2badbd':
  Add BluetoothProfile for PBAP PCE role.
 2016-03-15 23:30:30 +00:00
Joseph Pirozzo
f12a22cd53 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev 
am: d91859d246

* commit 'd91859d2460c45943568a98dab1950d53a4af608':
  Add BluetoothProfile for PBAP PCE role.
 2016-03-15 23:28:01 +00:00
Suprabh Shukla
0e2a53e60e Merge "Updating javadoc for DPM apis" into nyc-dev am: ff29237e89 
am: ccf0c799b7

* commit 'ccf0c799b71bb8e229f2804e4f07d2dda6cddb4c':
  Updating javadoc for DPM apis
 2016-03-15 23:25:42 +00:00
Suprabh Shukla
ccf0c799b7 Merge "Updating javadoc for DPM apis" into nyc-dev 
am: ff29237e89

* commit 'ff29237e895188e99106899806613aaa01656fdd':
  Updating javadoc for DPM apis
 2016-03-15 23:23:19 +00:00
Joseph Pirozzo
d91859d246 Merge "Add BluetoothProfile for PBAP PCE role." into nyc-dev 2016-03-15 23:21:12 +00:00