Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
157,876 Commits 3 Branches 0 Tags
a67b2ec07a35fae4960e5fd98ddf01fecac17295
Commit Graph

41539 Commits

Author SHA1 Message Date
Alan Viverette
21360c7339 am 5c2c69bb: am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '5c2c69bb552f2d7eaa357969ab0da8877441cc5a':
  Remove unsafe methods that take TypedArray
 2014-09-12 19:25:52 +00:00
Michael Wright
93f120b6ee am f015309d: am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit 'f015309d6df6647732d35e01133d278cd2b59e69':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 19:24:52 +00:00
George Mount
66618a18de am d40001d5: am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 
* commit 'd40001d585e818609ad9169da0a557a9dde1e16f':
  Fixed empty TransitionSet not notifying listeners.
 2014-09-12 19:24:46 +00:00
Amith Yamasani
20320aac7b am b7db8990: am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit 'b7db89906f6f7e7bae1213a1a17dac0b536bf45b':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 19:24:42 +00:00
Alan Viverette
55e948e41f am 30225f51: am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit '30225f51f0c00043c96f6f74e10a5181c1c4b10b':
  Vertically align toolbar child views with similar gravities
 2014-09-12 19:24:27 +00:00
Adam Powell
6e9f8a7be1 am 9854feaf: am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '9854feaf50aeae95adfa1a70e037a95d4cd3b85d':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 19:24:10 +00:00
Craig Mautner
72c781d7d0 am 2df97e5f: am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2df97e5f112ac74e34cf7ec243c1e37b4b1fd921':
  If activity is an alias get maxRecents from target
 2014-09-12 19:24:05 +00:00
Jeff Davidson
4dd5383175 am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit '1cb2e7603e13c23594b5a03b56f2fafd09d94c38':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 19:24:00 +00:00
Prerepa Viswanadham
8e91c94ca0 am a4a6bca6: am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit 'a4a6bca675df63115b52e7a16aebbdd6beb59657':
  Remove onConnectionCongested callback
 2014-09-12 19:23:47 +00:00
George Mount
e799cd44e0 am d28671db: am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'd28671db218886b24ca3fe38ad8446fdef04b5dc':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 19:23:31 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
Igor Murashkin
67335343f4 am 0682190b: am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '0682190b025b5039567532de2a752a00e7c20977':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 19:23:15 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 19:23:08 +00:00
Chet Haase
3e2ff75f7b am 4280132f: am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit '4280132f44a20d42cffd436d8eab7653c82b3249':
  Make starting window hw-accelerated
 2014-09-12 19:22:14 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
 2014-09-12 19:18:50 +00:00
Amith Yamasani
3b4bc41239 am 411eda84: am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '411eda84661bb1ddde095e51c00bc05a71d86451':
  Apply cross-user restrictions to Shell
 2014-09-12 19:18:30 +00:00
Alexandra Gherghina
c323e1cbca am 23e809a3: am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '23e809a396c44ab7c2b8a103b621ee49a9947640':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-12 19:17:37 +00:00
Przemyslaw Szczepaniak
990d99290d am c67fbc95: am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit 'c67fbc959991bb9c49ffcd4f0f238d74541a18d2':
  Replace TreeSet with HashSet.
 2014-09-12 19:17:26 +00:00
George Mount
79055af7e4 am ad2317c7: am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit 'ad2317c7dd51b1c0bbac223ef467d7a5b9ee613e':
  Omit appearing views that have a parent that is also appearing.
 2014-09-12 19:17:21 +00:00
Julia Reynolds
056c6d0e95 am b5f388f8: am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'b5f388f8f6b94dae5b8a4d4eb68316d52df4cdcd':
  Allow device owners to update LOCATION_MODE.
 2014-09-12 19:17:02 +00:00
Alexandra Gherghina
d681c23cd6 am dda4634d: am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit 'dda4634da53dd9732969ebf0871c9f4f3760c600':
  Remove package level intent forwarding.
 2014-09-12 19:15:56 +00:00
Paul Jensen
f0a0068496 am 14add2d2: am 576fc3ca: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev 
* commit '14add2d2140a85394024d67bb8d7fd156920721a':
  Flush HTTP socket pools and DNS cache when binding process to a Network.
 2014-09-12 18:04:11 +00:00
Paul Jensen
cb2403d453 am d0295aac: am 09ff9d7e: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev 
* commit 'd0295aac9c30e820424678fca3c0c7eaa8bdba65':
  Make Network.openConnection() share HttpHandlers not OkHttpClients.
 2014-09-12 18:04:06 +00:00
Alan Viverette
129890704d am 36348edf: am d843db67: Merge "Remove unsafe methods that take TypedArray" into lmp-dev 
* commit '36348edf997963043ca1fbf91dc59615d43ebcb1':
  Remove unsafe methods that take TypedArray
 2014-09-12 05:47:03 +00:00
Michael Wright
3dd0a6aabc am 79870899: am 44c97df3: Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
* commit '7987089963e29c993146a24470d412c2e83f98fa':
  Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY
 2014-09-12 05:46:19 +00:00
George Mount
9e30945202 am 4ac75dce: am 67f38b35: Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 
* commit '4ac75dced476a891b874a1c573067f2220898bb6':
  Fixed empty TransitionSet not notifying listeners.
 2014-09-12 05:46:14 +00:00
Amith Yamasani
95edc2dce0 am 807bce1c: am 7c855708: Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 
* commit '807bce1c3f178c196783f1cceec7d6d9cc42a520':
  Annotate bindServiceAsUser with SystemApi
 2014-09-12 05:46:09 +00:00
Alan Viverette
1c3d3e6a01 am bba2b9e8: am 8c7810a4: Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 
* commit 'bba2b9e8221a91dd03036b47e90f1ea364dc4fd2':
  Vertically align toolbar child views with similar gravities
 2014-09-12 05:45:53 +00:00
Adam Powell
9c8cfa5a3b am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit 'e82480b3a5ba0c342225035fac94020e41e5170a':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 05:45:37 +00:00
Craig Mautner
f20d09c17f am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2c85b1fcebdf08601124eada828da553a8d9f820':
  If activity is an alias get maxRecents from target
 2014-09-12 05:45:32 +00:00
Jeff Davidson
85e36549ae am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit 'bf2ac88fc4bceb56db27bfd3aa1483216648468f':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 05:45:26 +00:00
Prerepa Viswanadham
7af08c0547 am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit '0d8efe53e1d3d5eefd48b608416b8ac2a02e7fba':
  Remove onConnectionCongested callback
 2014-09-12 05:45:13 +00:00
George Mount
189a460a34 am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'b9a2399e205f231f07176063854a8410a7fec1c1':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 05:44:57 +00:00
George Mount
b6d4a7f141 am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9ace814b28d582e9cd08f13919ba5b672e2b72ef':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 05:44:51 +00:00
Igor Murashkin
5e03d27960 am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '5d2587c3ff59ac30b411f5b0d593707289ffc0aa':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 05:44:41 +00:00
Sreeram Ramachandran
ea949c3002 am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '6e06689c6dc38e57b83d73d22245fffe1b5065c4':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 05:44:36 +00:00
Chet Haase
dcce4a5119 am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit 'e58831a6a0edce3114686cb8168652a50e956031':
  Make starting window hw-accelerated
 2014-09-12 05:43:45 +00:00
Alan Viverette
e461d549bf Merge "Remove unsafe methods that take TypedArray" into lmp-dev 2014-09-12 01:30:35 +00:00
Michael Wright
1208e2718d Change constant to PowerManager.RELEAES_FLAG_WAIT_FOR_NO_PROXIMITY 
Bug: 17290118
Change-Id: Iae3866bf3f7ac24f756ec4c183e848a79d1f779b
 2014-09-12 00:23:14 +00:00
George Mount
a374bc049c Merge "Fixed empty TransitionSet not notifying listeners." into lmp-dev 2014-09-11 23:56:36 +00:00
Amith Yamasani
e1e98741ff Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev 2014-09-11 23:48:37 +00:00
Amith Yamasani
c85029f7d9 Annotate bindServiceAsUser with SystemApi 
Bug: 17470388
Change-Id: I0961e6ebabaffd91e3d152074b2f64ca4f9ba8fb
 2014-09-11 16:47:17 -07:00
Alan Viverette
5171dee215 Remove unsafe methods that take TypedArray 
BUG: 15782973
Change-Id: Ief4ff69c90c16b0e8c93316af9d46ae9639648fa
 2014-09-11 16:33:01 -07:00
Alan Viverette
34e53ab66e Merge "Vertically align toolbar child views with similar gravities" into lmp-dev 2014-09-11 23:24:48 +00:00
Alan Viverette
e3cb7baeb9 Vertically align toolbar child views with similar gravities 
Also fixes Body1 text size, action bar title size on sw600dp-land.

BUG: 17266152
Change-Id: Ib686dd6e80dfcdad920c922a532f4f5d6252fa19
 2014-09-11 16:23:29 -07:00
Adam Powell
fb008d6ac3 Merge "Remove View methods that can't be used safely from the SDK" into lmp-dev 2014-09-11 23:12:27 +00:00
Craig Mautner
3969cabf59 Merge "If activity is an alias get maxRecents from target" into lmp-dev 2014-09-11 23:02:27 +00:00
Craig Mautner
8307ea701c If activity is an alias get maxRecents from target 
Activity aliases do not pick up values in the PackageParser. The
actual values should come from the target activity instead.

Also ActivityInfo now propagates maxRecents in copy constructor
and across Binder calls (via parcelling).

Fixes bug 17391328.

Change-Id: I35d248032eca7557528c9d499b3b38f27c713d09
 2014-09-11 15:53:44 -07:00
Jeff Davidson
8afddbe7e9 Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 2014-09-11 22:41:24 +00:00