drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,813 Commits 1 Branch 0 Tags
Commit Graph

168813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adrian Roos
2a5663d524 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
automerge: 62a7d53

* commit '62a7d5334315b4153f1da1112f945d13f72e0381':
  Add device locked API for TrustAgentService
 2014-11-21 02:47:16 +00:00
Adrian Roos
cf047b5d55 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
automerge: 866bae5

* commit '866bae50b7e8f0389b67df54eaf829fa50bc8eaf':
  Update KeyguardManager.isDeviceLocked API
 2014-11-21 02:46:16 +00:00
Craig Mautner
117f0c15f7 am 25418aab: Merge "Ensure arraylist index is montonically decreasing" into lmp-mr1-dev 
automerge: 9bb16f5

* commit '9bb16f55e80afaeb6700af9fc97a58a8b3309412':
  Ensure arraylist index is montonically decreasing
 2014-11-21 02:44:31 +00:00
Eric Rowe
496c67031b am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-dev 
automerge: 3b442e2

* commit '3b442e23d859e84fe0550242257294c0b1e37438':
  Fix wifi reconnection tests.
 2014-11-21 02:43:06 +00:00
Wink Saville
49414b5b21 am 816e19eb: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 
automerge: 1caab41

* commit '1caab41f31b2fd1129dff58fc678361b691af9db':
  Revert "Additional changes to SubscriptionManager API as per API council."
 2014-11-21 02:41:53 +00:00
Wink Saville
07fb24576a am 4a57e908: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
automerge: 68c21d6

* commit '68c21d6736a2ec54d36c8b33b815062c568e4707':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-21 02:39:23 +00:00
Craig Mautner
3985b44b20 am 37983832: Merge "Use package name as custom resolver process name" into lmp-mr1-dev 
automerge: 8d1ab6f

* commit '8d1ab6f2002d65dd351b0affd86cdfdbc27fd0fa':
  Use package name as custom resolver process name
 2014-11-21 02:38:20 +00:00
Adam Lesinski
36671b925c am 825e0da2: Merge "Fix race when cleaning up receivers/services in Context" into lmp-mr1-dev 
automerge: b7ce6d6

* commit 'b7ce6d6db1409ec785d2d7146cbcc897fd02d85b':
  Fix race when cleaning up receivers/services in Context
 2014-11-21 02:36:57 +00:00
Eric Rowe
37368d7ae4 am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-dev 
automerge: d2fd1bd

* commit 'd2fd1bd9d631e822b03bfabd41853cc3075f61bf':
  Fix wifi tethering tests.
 2014-11-21 02:35:36 +00:00
Alan Viverette
aed12685b0 am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev 
* commit 'a19f057792e21879f0f071f361c13bc9e41f6a9d':
  Move default token handling into WindowManagerImpl
 2014-11-21 01:38:26 +00:00
Alan Viverette
16c5d2547b am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '05275a2cbd2f31dbb098dc45a79379f1b7b964db':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 01:38:21 +00:00
Jae Seo
cfaac8d154 am 12c03e33: am f66f3052: Merge "TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView." into lmp-mr1-dev 
* commit '12c03e3386db46f2452dd7642771adad1d03ce5c':
  TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView.
 2014-11-21 01:37:51 +00:00
Jae Seo
7d97be9dbc am 91ab2665: am 52bfa332: Merge "TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()" into lmp-mr1-dev 
* commit '91ab2665ed73a37ac9dda52e7d440784b1d1011e':
  TIF: enhance documentation for TvInputManager.getAvailableStreamConfigs()
 2014-11-21 00:44:27 +00:00
Jae Seo
71bda35151 am 89d8fb55: am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '89d8fb555a165d353fc515922d9851dc131e0c1b':
  TIF: fix setSurface() logic
 2014-11-21 00:44:21 +00:00
Winson Chung
4ddbed3d1f am de04d557: am 7c122b60: Merge "Use SystemClock time to keep track of last event times. (Bug 17995039)" into lmp-mr1-dev 
* commit 'de04d5573af33aa4357ec2e97708f07c30265333':
  Use SystemClock time to keep track of last event times. (Bug 17995039)
 2014-11-21 00:44:15 +00:00
Geoffrey Borggaard
aba9abaefa am c2af9be6: am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'c2af9be62c4a8d5da6396c419413e1193c34928e':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-21 00:44:09 +00:00
Dianne Hackborn
5b01f0894d am 42d9bf66: am a6d2789c: Merge "Add new empty app test entry points." into lmp-mr1-dev 
* commit '42d9bf665598ae316bfae3fd28cbb5c8f2c95824':
  Add new empty app test entry points.
 2014-11-21 00:43:57 +00:00
Dianne Hackborn
377d6f00dc am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit '42fec57f3addfb1958f814b5d6772ff81341ba20':
  Fix issue with call backs from media process.
 2014-11-21 00:43:51 +00:00
Martijn Coenen
0d4a4e6e59 am a603f083: am 2bf6529b: Merge "Verify NFC permission immediately on API calls." into lmp-mr1-dev 
* commit 'a603f083ff8dbbc5ed2803d8f402accac135d891':
  Verify NFC permission immediately on API calls.
 2014-11-21 00:43:45 +00:00
RoboErik
bbf0f662a8 am 3ef3a9bf: am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit '3ef3a9bff37d2fbe216110e025f683923c58ddba':
  Handle volume events on master volume devices correctly
 2014-11-21 00:43:39 +00:00
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
 2014-11-21 00:43:33 +00:00
Shishir Agrawal
84b988e6ee am 0783a61d: am a9b67771: Merge "Carrierprivileges: Addressing API council suggestions." into lmp-mr1-dev 
* commit '0783a61d8a6f17ca0fe3d0e55a3c48aceec823d4':
  Carrierprivileges: Addressing API council suggestions.
 2014-11-21 00:43:23 +00:00
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00
Chih-hung Hsieh
cd24a6d70b am 43b8643e: am f926d71b: Merge "Fix format strings mismatching the parameters passed to them" 
* commit '43b8643e86d7c5d0d5cf536336126232454f361a':
  Fix format strings mismatching the parameters passed to them
 2014-11-20 23:57:35 +00:00
Chih-hung Hsieh
43b8643e86 am f926d71b: Merge "Fix format strings mismatching the parameters passed to them" 
* commit 'f926d71b8ef2790da067550144860705c1a61fe5':
  Fix format strings mismatching the parameters passed to them
 2014-11-20 23:53:33 +00:00
Chih-hung Hsieh
f926d71b8e Merge "Fix format strings mismatching the parameters passed to them" 2014-11-20 23:50:04 +00:00
Dan Albert
3a091b7997 resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp 
Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
 2014-11-20 15:41:25 -08:00
Bernhard Rosenkränzer
09993f768b Fix format strings mismatching the parameters passed to them 
Change-Id: Ia0d33aec9edadac60508fb422e0821e6d8f28afa
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-20 15:24:46 -08:00
Dan Albert
8e0cfe7c9e am 8e357bf5: Merge "Fix clang warnings in core/jni." 
* commit '8e357bf54173c3f83584c10983392f0d87e0b2b3':
  Fix clang warnings in core/jni.
 2014-11-20 23:02:29 +00:00
Ignacio Solla
a8f7a40b4b am 57ad8255: (-s ours) [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
* commit '57ad825546d9cb802577f9a1a68213fcd978fb17':
  [WebView] Interface to access hidden APIs. (DO NOT MERGE)
 2014-11-20 23:01:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
8e357bf541 Merge "Fix clang warnings in core/jni." 2014-11-20 22:58:47 +00:00
Ignacio Solla
57ad825546 [WebView] Interface to access hidden APIs. (DO NOT MERGE) 
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0cf0387df20c2c602857ada1e5abfdd6
 and 53f256948724b8d4009d8a8a47da96a06402f9a2)
 2014-11-20 22:29:33 +00:00
Dan Albert
d8c169fedf am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '0c437fd3a79ba5f9118ec10940a3398665690587':
  Add appropriate casts for char16_t.
 2014-11-20 22:25:07 +00:00
Dan Albert
0c437fd3a7 Merge "Add appropriate casts for char16_t." 2014-11-20 22:19:38 +00:00
Adrian Roos
62a7d53343 am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 
* commit '4e312d81c18b286170c904659e78cab4fdf27200':
  Add device locked API for TrustAgentService
 2014-11-20 21:41:46 +00:00
Adrian Roos
866bae50b7 am af6e657a: Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 
* commit 'af6e657ab873623ed0e94bc8bcf8ed03f6bbe167':
  Update KeyguardManager.isDeviceLocked API
 2014-11-20 21:41:41 +00:00
Adrian Roos
4e312d81c1 Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev 2014-11-20 21:38:17 +00:00
Adrian Roos
af6e657ab8 Merge "Update KeyguardManager.isDeviceLocked API" into lmp-mr1-dev 2014-11-20 21:38:14 +00:00
Jorim Jaggi
c51fdd1bbf am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
automerge: 6456513

* commit '6456513f6ff844fd15f3453a66fcc8fb439e1ef7':
  Fade notifications when exiting dozing
 2014-11-20 21:31:41 +00:00
Selim Cinek
8e78110795 am b18cbb9a: Merge "Fixed a bug where the notifications were not animating" into lmp-mr1-dev 
automerge: c9a39c7

* commit 'c9a39c7dd1e50bea6b6ba9abc20dafe3204aece7':
  Fixed a bug where the notifications were not animating
 2014-11-20 21:30:17 +00:00
George Mount
b986f82cff am 41975454: Merge "Reset the transitionAlpha after the transition completes." into lmp-mr1-dev 
automerge: bf50b88

* commit 'bf50b88ed70c2f34b2426ce80213698e46d09eb0':
  Reset the transitionAlpha after the transition completes.
 2014-11-20 21:28:33 +00:00
George Mount
e8a4055a09 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
automerge: b883579

* commit 'b8835791e2d2fab41277597008010a5681dacb41':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:27:17 +00:00
Adrian Roos
4533e197bf am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev 
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar
 2014-11-20 21:26:00 +00:00
John Spurlock
224a0640c9 am ef86a828: Merge "QS: Inversion tile: Don\'t consider initial 0 setting trackable." into lmp-mr1-dev 
automerge: ae08003

* commit 'ae08003115488e08b69e0db2e75eca56405bd928':
  QS: Inversion tile: Don't consider initial 0 setting trackable.
 2014-11-20 21:24:31 +00:00
Wonsik Kim
fa8276c3ed am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
automerge: b429c01

* commit 'b429c01558c65b12e2c4ebec59f146e86aa460bb':
  TIF: set audio gain properly
 2014-11-20 21:22:45 +00:00
Tyler Gunn
2fefd7acf5 am d4340f89: Merge "Change Connections to allow setting conferenceable with conferences." into lmp-mr1-dev 
automerge: ce5a8e8

* commit 'ce5a8e861d16814e1d452f4512f05b258b95de1d':
  Change Connections to allow setting conferenceable with conferences.
 2014-11-20 21:20:30 +00:00
Wale Ogunwale
1e910d17ce am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
automerge: 005080e

* commit '005080e5f8c3cfd7918bb9a62e36384d6a08351e':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 21:17:45 +00:00
Pavel Zhamaitsiak
950daf58af am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 
automerge: 0208d3c

* commit '0208d3c8236af7c72d47c9c04ae1a79d0343559d':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 21:14:39 +00:00
Chet Haase
a2b3a75ca5 am 85603a7f: Merge "Fix seeking and scaled duration behavior" into lmp-mr1-dev 
automerge: a79d2e8

* commit 'a79d2e86649dfb96159c2aebd94b4a5e19d66eb1':
  Fix seeking and scaled duration behavior
 2014-11-20 21:13:10 +00:00