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

41483 Commits

Author SHA1 Message Date
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
Matthew Williams
146eccccbd am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit '04f538e80614567cb175e2021265d2b6cd727a99':
  Add flag to JobParameters for job expired
 2014-09-11 18:32:08 +00:00
Amith Yamasani
5f0439d729 am 3b18a0c5: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev 
* commit '3b18a0c5f8efdb915fb1304c959236d608eb8b79':
  Apply cross-user restrictions to Shell
 2014-09-11 18:31:06 +00:00
Alan Viverette
a2d2aaabb2 am 4a8d9449: am 5f9ce5e9: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev 
* commit '4a8d944934b47cd3a0e9a52b5b133c550fe9c836':
  Use Calendar day of week rather than Time in SimpleMonthView
 2014-09-11 17:28:17 +00:00
Svetoslav Ganov
24b4c4e82c am 983a6f93: am b6e7e347: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev 
* commit '983a6f9385389e7d82ee4ea1d4343b949a67849d':
  Using the correct package name for ContentResolver
 2014-09-11 17:28:05 +00:00
Matthew Williams
91911fd952 Merge "Add flag to JobParameters for job expired" into lmp-dev 2014-09-11 17:27:58 +00:00
Dianne Hackborn
3cec76c455 am 1fa1dd50: am f6f453d1: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev 
* commit '1fa1dd50bad987722c8907b1b305597884b7cc65':
  Fix issue #17428001: Fix revokeUriPermissions
 2014-09-11 17:27:48 +00:00
Lajos Molnar
5a52457fab am 7fca7f55: am b9414beb: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev 
* commit '7fca7f55f21cd34b94ace89167f6516228520bff':
  add android.util.SizeF.parseSizeF()
 2014-09-11 17:27:43 +00:00
Alan Viverette
a75f6b3159 am b2f46415: am ba870607: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev 
* commit 'b2f46415d2a05e25a9eca912060958ac0d827c59':
  Fix docs and nulling behavior for TextView.setCompoundDrawables
 2014-09-11 17:26:57 +00:00
Alan Viverette
cfd3deef7d am 28d22bd2: am 1c19026d: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev 
* commit '28d22bd23b219fc65eb80da04945fc0b72100040':
  Make SearchView styles public, remove public Holo styles added in L
 2014-09-11 17:26:40 +00:00
George Mount
10dcaa134f am b13022fd: am 86d1c5d3: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev 
* commit 'b13022fd5fc168a70cd833dc355ee7ae05938891':
  Fix ArrayIndexOutOfBoundsException.
 2014-09-11 17:25:07 +00:00
Tao Bai
b1664bd741 am 42a3b372: am cdad4651: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev 
* commit '42a3b372b5c41f5fe9b3c4e8645a924e32dd0443':
  Revise createIntent and parseResult API.
 2014-09-11 17:24:48 +00:00
Craig Mautner
de1c660b36 am 242c891a: am 99a902ed: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev 
* commit '242c891a8896977c90254a838b8f36fa165fdb6f':
  Wait for animation complete before completing boot
 2014-09-11 17:24:32 +00:00
George Mount
6381c728ae am 92eba9f0: am 7726c740: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev 
* commit '92eba9f08abd508a849209c09328a3b1b3eb5c33':
  Move capturing entering views until just before transition.
 2014-09-11 17:24:04 +00:00
Chet Haase
1368cbb2e9 am 35dc5ec9: am 969628cd: am 804df9eb: Use constant state in AnimatedVectorDrawable 
* commit '35dc5ec9877b468cba32c60b729bfded559a5c5a':
  Use constant state in AnimatedVectorDrawable
 2014-09-11 17:24:00 +00:00
Raph Levien
cfbcca8992 am 75e39a46: am fff6aab7: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev 
* commit '75e39a46e1df35bfd3f77b4583b31ca24888651e':
  Remove auto spaceifying behavior on paste
 2014-09-11 17:23:07 +00:00
Jon Miranda
0b50acd03f am ea01c7d4: am a8ced922: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev 
* commit 'ea01c7d4ff251d6702ca687b5bf83f7928a30aaa':
  Tries to resolve reference resource names instead of its data.
 2014-09-11 17:22:44 +00:00
Eino-Ville Talvala
c060183610 am 88720d12: am 6b63cd11: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev 
* commit '88720d12694af351811572c3de80e9a1eae7c637':
  Camera2: Allow captures right after abort
 2014-09-11 17:22:02 +00:00
Amith Yamasani
f58e532e01 Merge "Apply cross-user restrictions to Shell" into lmp-dev 2014-09-11 16:46:34 +00:00
Alexandra Gherghina
802669e7f8 am 3507cc0f: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 
* commit '3507cc0f8474d28b834fd4382397975478c63725':
  Bugfix: use the correct user for ContentResolver calls
 2014-09-11 16:31:57 +00:00
Przemyslaw Szczepaniak
25183677ef am 817dbc8c: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev 
* commit '817dbc8c2aa437388617238e3fb6c4dc6ecf5849':
  Replace TreeSet with HashSet.
 2014-09-11 16:16:24 +00:00
George Mount
6929f050ef am 6a6c4eed: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 
* commit '6a6c4eed6b1bf7f3a00b28b41d984d0113377b76':
  Omit appearing views that have a parent that is also appearing.
 2014-09-11 16:16:20 +00:00
Alexandra Gherghina
ffb6343938 Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev 2014-09-11 16:12:59 +00:00
Julia Reynolds
3fb8348ecd am a098030f: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 
* commit 'a098030f70a4861a4c0f7241d8a95f1d6441e5ed':
  Allow device owners to update LOCATION_MODE.
 2014-09-11 16:04:20 +00:00
Przemyslaw Szczepaniak
6931cc9f41 Merge "Replace TreeSet with HashSet." into lmp-dev 2014-09-11 15:59:36 +00:00
Przemyslaw Szczepaniak
3786bc5498 Replace TreeSet with HashSet. 
Both Locale and Voice do not implement Comparable.

Bug: 17467923
Change-Id: I683577e5b18ae1892e1ccea5ea241e1d016c9517
 2014-09-11 16:56:46 +01:00
George Mount
27d83aa9a8 Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev 2014-09-11 15:53:36 +00:00
Julia Reynolds
d86734b469 Merge "Allow device owners to update LOCATION_MODE." into lmp-dev 2014-09-11 15:46:07 +00:00
Alexandra Gherghina
ad8adc1b40 am 04d1560c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev 
* commit '04d1560cac01a35776e84210b1e41038a4d7df84':
  Remove package level intent forwarding.
 2014-09-11 15:36:21 +00:00
Alexandra Gherghina
02b6addb53 Merge "Remove package level intent forwarding." into lmp-dev 2014-09-11 15:17:21 +00:00
Adam Connors
e107c3eb79 Remove package level intent forwarding. 
Clean up unused methods.

Bug: 17389110
Change-Id: I8a80fe3e14219f06572de05c390cdda0efcbf5db
 2014-09-11 15:42:13 +01:00
Robert Greenwalt
500c2e7c2c am efee3dea: am 5ad894d6: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev 
* commit 'efee3dea05d39d458519c259604394da91a7a722':
  Don't accept score below 0.
 2014-09-11 14:16:53 +00:00
Jeff Davidson
9441a44c6d am e966d4d8: am 426a5429: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev 
* commit 'e966d4d86c140b059158504e615042daa7d8e04f':
  Update unclear Fragment Javadoc.
 2014-09-11 14:15:50 +00:00
Ruben Brunk
09f0d12d3a am 2868a44d: am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '2868a44d846345308fd0784ee3a31b280af66e9f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-11 14:15:03 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Jason Monk
b01080dcd2 am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
  Move zen mode constants and code to framework
 2014-09-11 14:13:51 +00:00
John Spurlock
7377b57689 am cbd0cdc2: am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit 'cbd0cdc297a140179b583c613591933d6fa8a643':
  Zen: make Condition available over @SystemApi
 2014-09-11 14:13:45 +00:00
George Mount
5aadc5e322 am 57980dca: am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '57980dca613fee54e4993ea3cd12dd928b1fe007':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-11 14:13:37 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
 2014-09-11 14:13:32 +00:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
 2014-09-11 14:13:24 +00:00
Adrian Roos
b6b356c07e am c52a9597: am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'c52a95973ebacd5afcd6b2ae4937983726493d25':
  Add system trust agents on first boot or when adding user
 2014-09-11 14:12:53 +00:00
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00