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

62685 Commits

Author SHA1 Message Date
Roozbeh Pournader
c1e4cb1da4 Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev am: 886ad06 
am: fcf4352

* commit 'fcf435294c0eb9bdb0946bf5a44465eaa68d3ae4':
  Clean up BoringLayout#isBoring() a little
 2016-03-17 18:55:03 +00:00
Makoto Onuki
5031e5f97a Merge "Add "pm set-home-activity"" into nyc-dev am: 1b21124 
am: e10a984

* commit 'e10a984bab7667c4780cd952c684ecd915303e5c':
  Add "pm set-home-activity"
 2016-03-17 18:54:46 +00:00
Eino-Ville Talvala
3a12f7e4cd Merge "Adjust graphics dataspace references to new standard" into nyc-dev am: 61adad8 
am: eff923b

* commit 'eff923b3f75692bebe84825985203da277a540c7':
  Adjust graphics dataspace references to new standard
 2016-03-17 18:54:43 +00:00
destradaa
dd15c1e553 Merge "Update ContextHubManager\'s System APIs." into nyc-dev am: 5e19f91 
am: 3df5814

* commit '3df581491088d567da9e8be5ee499b6754db9127':
  Update ContextHubManager's System APIs.
 2016-03-17 18:54:39 +00:00
Eric Laurent
1a1307d4bf Merge "AudioService: do not persist mic mute and master mute" into nyc-dev am: 495defd 
am: fa52f28

* commit 'fa52f2838a02fd065420fcd57ebd41892c54864d':
  AudioService: do not persist mic mute and master mute
 2016-03-17 18:54:32 +00:00
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
Roozbeh Pournader
fcf435294c Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev 
am: 886ad06

* commit '886ad0690bd3b4e7ee08f032432eefe53a2bdaa9':
  Clean up BoringLayout#isBoring() a little
 2016-03-17 17:35:24 +00:00
Makoto Onuki
e10a984bab Merge "Add "pm set-home-activity"" into nyc-dev 
am: 1b21124

* commit '1b21124d126792e77cdac40c7342adb3486f004b':
  Add "pm set-home-activity"
 2016-03-17 17:35:15 +00:00
Eino-Ville Talvala
eff923b3f7 Merge "Adjust graphics dataspace references to new standard" into nyc-dev 
am: 61adad8

* commit '61adad884b8d5fb8e2aa38b693bc2dce39bf92c8':
  Adjust graphics dataspace references to new standard
 2016-03-17 17:35:13 +00:00
destradaa
3df5814910 Merge "Update ContextHubManager\'s System APIs." into nyc-dev 
am: 5e19f91

* commit '5e19f91585ca82ae58e854491dd67ee2e9f66eba':
  Update ContextHubManager's System APIs.
 2016-03-17 17:35:12 +00:00
Eric Laurent
fa52f2838a Merge "AudioService: do not persist mic mute and master mute" into nyc-dev 
am: 495defd

* commit '495defd74f9a47dec33eb27ca25f5e390bd3fb4a':
  AudioService: do not persist mic mute and master mute
 2016-03-17 17:35:08 +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
Roozbeh Pournader
886ad0690b Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev 2016-03-16 23:46:53 +00:00
Makoto Onuki
1b21124d12 Merge "Add "pm set-home-activity"" into nyc-dev 2016-03-16 23:14:04 +00:00
Eino-Ville Talvala
61adad884b Merge "Adjust graphics dataspace references to new standard" into nyc-dev 2016-03-16 22:49:37 +00:00
Makoto Onuki
4828a59d68 Add "pm set-home-activity" 
This is needed to change the default launcher on CTS for
ShortcutManager.

- When the default set with DPM.addPersistentPreferredActivity() is
still stronger.

- Ideally we should unify the code with HomeSettings, but I couldn't
find a good way to do this.

- I didn't make it to work to set the default for any intents
because building an intent filter from a command line would be
painful.

Bug 27548047

Change-Id: I66b153c20c7796147f77214b483112629f9d80c5
 2016-03-16 15:21:56 -07:00
Daniel Estrada Alva
5e19f91585 Merge "Update ContextHubManager's System APIs." into nyc-dev 2016-03-16 21:49:12 +00:00
Roozbeh Pournader
3cf8208a62 Clean up BoringLayout#isBoring() a little 
No functional change. Just some renames and clarifications.

Bug: 23641693
Bug: 27702584
Change-Id: I14efe290a27c695ab79bbb18f9f069c8a2d3ffd6
 2016-03-16 14:48:39 -07:00
Eric Laurent
495defd74f Merge "AudioService: do not persist mic mute and master mute" into nyc-dev 2016-03-16 21:09:31 +00:00
destradaa
8bad3fec0f Update ContextHubManager's System APIs. 
- Consolidates the use of handles in context hub, and nano apps.
- Quick fixes to typos.
- Update the signature to find nano apps to use primitive types

Change-Id: Icffa6fa86e0e33a536516d98bc4674c0a39b2163
 2016-03-16 14:05:58 -07: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
Ian Rogers
41088c75a4 Merge "Extra generic type information to aid certain javacs." am: 8b9e56e 
am: 0dbdcea

* commit '0dbdcead0a86c7fb0c32681c4d2d719195621df6':
  Extra generic type information to aid certain javacs.
 2016-03-16 18:59:41 +00:00
Ian Rogers
0dbdcead0a Merge "Extra generic type information to aid certain javacs." 
am: 8b9e56e

* commit '8b9e56e043d74249be8230db653c65d3ade94873':
  Extra generic type information to aid certain javacs.
 2016-03-16 18:56:36 +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
Roshan Pius
1b191e8e94 Merge "Fix a bug in ControllerActivityCounter" into nyc-dev am: 85eb7a9 
am: c49a5f3

* commit 'c49a5f37c8613fdc594c9a052d241d6c6b4e1608':
  Fix a bug in ControllerActivityCounter
 2016-03-16 15:14:48 +00:00
Roshan Pius
c49a5f37c8 Merge "Fix a bug in ControllerActivityCounter" into nyc-dev 
am: 85eb7a9

* commit '85eb7a97ef59a83f45208737ac83d4b3ea8f7a2c':
  Fix a bug in ControllerActivityCounter
 2016-03-16 15:11:56 +00:00
Roshan Pius
85eb7a97ef Merge "Fix a bug in ControllerActivityCounter" into nyc-dev 2016-03-16 15:05:14 +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