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

146805 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoltan Szatmary-Ban
e37e43d0bd Update Data Usage Settings for Enterprise 
Applications of the managed profile are shown
with badged icon on the "Data Usage" app list.
A total of managed profile data usage (if any)
is displayed top of the list.

Bug: 15466834

Change-Id: Ie75fb0ddc240ea1e5d1097feda7b7b5931256fcb
 2014-07-29 10:21:43 +01:00
vandwalle
5c593ab1df am 5029e1f3: Merge "fix typo in scanresult" into lmp-dev 
* commit '5029e1f37def8ebbf4e80e44d8b5e10a222987af':
  fix typo in scanresult
 2014-07-29 04:01:30 +00:00
vandwalle
01990135b2 am c7c85579: Merge "add debug info to wificonfiguration dump" into lmp-dev 
* commit 'c7c8557933bd3b14c4ff03d4f7df9d78a136b746':
  add debug info to wificonfiguration dump
 2014-07-29 03:42:18 +00:00
John Spurlock
73a8ae3cea am 0eeaaa39: Merge "Zen: Classify notifications using the alarm stream." into lmp-dev 
* commit '0eeaaa39d06777adf5133b6dd0c037d93584f9a6':
  Zen: Classify notifications using the alarm stream.
 2014-07-29 03:38:03 +00:00
Sailesh Nepal
a0dbc5366d am 66928fc9: Merge "Fix WTF when creating a lazily initialized connection" into lmp-dev 
* commit '66928fc9d90534598528b91c0628245d3c1d77fc':
  Fix WTF when creating a lazily initialized connection
 2014-07-29 03:37:58 +00:00
John Spurlock
d22c30cc3e am e78d5af1: Merge "Settings: Constants for notification settings." into lmp-dev 
* commit 'e78d5af1b7ffc819eff52afff82e11453295e01d':
  Settings: Constants for notification settings.
 2014-07-29 02:15:23 +00:00
Sailesh Nepal
b61eae1d19 am 53522516: Handle synchronous failed connection 
* commit '535225161324a4da618d6c12597ec95948916351':
  Handle synchronous failed connection
 2014-07-29 01:55:56 +00:00
Sailesh Nepal
4e7ec71e64 Handle synchronous failed connection 
Change-Id: I406ccbdd1f70c85456b6e0d689332cf40a756707
 2014-07-29 01:46:57 +00:00
Filip Gruszczynski
c6f72ec4eb am 005ec21c: am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '005ec21c2c56434c8fd81243a7e3a11d68176501':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:14:34 +00:00
Craig Mautner
f7035e5cd7 am 842e4132: am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '842e41322daa8edc387372dfea76f05506da7235':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:14:30 +00:00
Filip Gruszczynski
0fa59b898a am 896a82d7: am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit '896a82d77e732c7387b2279bcdd0f04d696b13df':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-29 01:08:09 +00:00
Craig Mautner
7544c82997 am 09875ec7: am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '09875ec7292b19e07c38b6127406d6aa7490e26c':
  Remove PendingActivityLaunches based on stack.
 2014-07-29 01:07:59 +00:00
Robert Greenwalt
9049775700 am 89a20049: Merge "Remove dead code 3." into lmp-dev 
* commit '89a200494f82371c1238d21a23c22a6ec5d41e82':
  Remove dead code 3.
 2014-07-29 00:59:59 +00:00
John Spurlock
25a27c7d3a am 5c93904b: Zen: follow independent ringer mode changes. 
* commit '5c93904b3aee698306d67521446d72ece3a4ef96':
  Zen: follow independent ringer mode changes.
 2014-07-29 00:47:55 +00:00
Sreeram Ramachandran
aa19b10ec7 am bce2867e: Allow VPNs to add/remove link addresses dynamically. 
* commit 'bce2867ef034e8b658d809dca76194456990b328':
  Allow VPNs to add/remove link addresses dynamically.
 2014-07-29 00:47:51 +00:00
John Spurlock
8c01d88208 Zen: follow independent ringer mode changes. 
Bug:16624498
Change-Id: Ib623118970a82c8406c714687b1b516378fe7824
 2014-07-28 20:39:17 -04:00
Sreeram Ramachandran
f4e0c0cb8e Allow VPNs to add/remove link addresses dynamically. 
Bug: 15409819
Change-Id: If91fc6891d7ce04060362c6cde8c57462394c4e8
 2014-07-29 00:32:59 +00:00
Riley Andrews
49d06dccc6 am d85845c6: Merge "Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia\'s implementation." into lmp-dev 
* commit 'd85845c6e00fb56d618f280b8ff7a03c12af8623':
  Add cursor flags into SpriteController to suppor async cursor updates. - This is fairly blindly taken from nvidia's implementation.
 2014-07-28 23:59:13 +00:00
Filip Gruszczynski
896a82d77e am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev 
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
  Fix double chin issue, where bottom inset is applied twice.
 2014-07-28 23:40:13 +00:00
Craig Mautner
09875ec729 am 0fa45d93: Merge "Remove PendingActivityLaunches based on stack." into klp-modular-dev 
* commit '0fa45d93f7265c130d5dc49a51130ed74db5cec9':
  Remove PendingActivityLaunches based on stack.
 2014-07-28 23:28:59 +00:00
Winson Chung
12b1a4047a am 7097f6e8: Merge "Updating lock-to-app look." into lmp-dev 
* commit '7097f6e8d539d8694ed815b83936ed3d21ff057d':
  Updating lock-to-app look.
 2014-07-28 23:27:09 +00:00
Christopher Tate
d7f8fdf4ef am 3c4efc3e: Merge "Provide outside-facing API for data management intent+label" into lmp-dev 
* commit '3c4efc3ed95aeaf30d940b6a7f1ccf69eb7f9bfa':
  Provide outside-facing API for data management intent+label
 2014-07-28 23:27:04 +00:00
Baligh Uddin
900800e4c2 am 43fa0c1a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '43fa0c1a33f92e6dbf60f649456f23128e21112e':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:54 +00:00
Baligh Uddin
0919b11f6f am e47f344c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e47f344c49b58d85a6f3c9bb58e7b188505bdec5':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:50 +00:00
Baligh Uddin
7b7e24bd6a am c7fa2051: (-s ours) Import translations. DO NOT MERGE 
* commit 'c7fa2051e8668500b16cae779360ead61d54c16a':
  Import translations. DO NOT MERGE
 2014-07-28 23:20:46 +00:00
Jinsuk Kim
3a6de8c605 am c6a4ac34: Merge "Add MHL getPortInfo" into lmp-dev 
* commit 'c6a4ac34865c844a30fe9836c264d0da1688e9db':
  Add MHL getPortInfo
 2014-07-28 23:15:35 +00:00
Baligh Uddin
df84404d58 Import translations. DO NOT MERGE 
Change-Id: I1fcd1e840d7fbcc47d41e1dc997b685b6c4b9205
Auto-generated-cl: translation import
 2014-07-28 23:12:31 +00:00
Eric Laurent
a6143a974a am 2649acb4: rename AudioSystem::newAudioSessionId() 
* commit '2649acb4fcbf59c29b55916b5bf7237157a21ffa':
  rename AudioSystem::newAudioSessionId()
 2014-07-28 22:47:45 +00:00
Yin-Chia Yeh
478db221eb am 9c65a371: Merge "Camera2: Fix wrong usage of toArray" into lmp-dev 
* commit '9c65a371063acb6fff6c23e695b06c20ce943b54':
  Camera2: Fix wrong usage of toArray
 2014-07-28 22:47:34 +00:00
Robert Greenwalt
b71748552c am 1829b111: Merge "Remove dead code 2." into lmp-dev 
* commit '1829b111f11c2813488e427c3505d5cbf7c96597':
  Remove dead code 2.
 2014-07-28 22:47:29 +00:00
Guang Zhu
fa4b5466bb Merge "disable flashlight for monkey tests" into lmp-dev 2014-07-28 22:45:16 +00:00
Guang Zhu
2649f6b22a disable flashlight for monkey tests 
Change-Id: I81f459d41a780712f4c02e7ac7c0b51312e404be
 2014-07-30 00:52:58 -07:00
Alan Viverette
9e244b93c4 Merge "Revert "Update switch assets, fix SearchView asset 9-patch areas"" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
9b38f6c2cd Revert "Update switch assets, fix SearchView asset 9-patch areas" 
Missing updated current.txt

This reverts commit dbf6b0d68a3d502430d061cd14f03f344b50f019.

Change-Id: I70846883f56be661fa89f9eaf20f5d103f2833c6
 2014-07-30 02:39:07 +00:00
Aravind Akella
6fc1901b1a Merge "SensorManager API changes." into lmp-dev 2014-07-28 22:45:16 +00:00
Aravind Akella
0288ca63e3 SensorManager API changes. 
i) Remove WAKE_UP_* sensor constants and corresponding string constants.
     ii) Add getDefaultSensor(int, boolean) API.

Bug: 16399898
Change-Id: I53cb7dec02568503ebd35983e6b0c64e9c5070d7
 2014-07-29 17:41:02 -07:00
Ying Wang
8b5a858ee3 Merge "Fix docs build." into lmp-dev 2014-07-28 22:45:16 +00:00
Ying Wang
546f3bf5fe Fix docs build. 
Change-Id: I735f5b5a3fe36a454e384d5060d9273a9aabf3aa
 2014-07-29 16:23:15 -07:00
Robert Shih
05ad96e9a3 Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev 2014-07-28 22:45:16 +00:00
Robert Shih
c42a96dba4 MediaPlayer: scanInternalSubtitleTracks in synchronous prepare 
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
 2014-07-29 11:55:46 -07:00
Robert Ly
1c977b3744 Merge "docs: fix typo bug 16623189" into klp-modular-docs 2014-07-28 22:45:16 +00:00
Robert Ly
a66de16cde docs: fix typo bug 16623189 
Change-Id: Ia790587cf60cbf4e9f699605a5ad6a7dc5a06799
 2014-07-29 16:26:36 +00:00
Robert Ly
a37ddd97a8 docs: fix typo 
Change-Id: I4d76d625dc508e7279162d1d3ace9c32625e1358
 2014-07-29 08:33:17 -07:00
Alan Viverette
4d193bdbe7 Merge "Clean up TimePicker and DatePicker styling" into lmp-dev 2014-07-28 22:45:16 +00:00
Alan Viverette
60727e07c6 Clean up TimePicker and DatePicker styling 
Removes the time and date picker specific themes and defaults their
theme attributes to use the alert dialog theme attribute's value.

BUG: 14973897
Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
 2014-07-29 12:49:50 -07:00
Matthew Williams
94703148bc Merge "remove possible JobScheduler race in cancel()" into lmp-dev 2014-07-28 22:45:16 +00:00
Matthew Williams
ee410da42b remove possible JobScheduler race in cancel() 
Client can jobFinished() before getting a cancel msg.
1) Do better clean up of JobServiceContext after client jobFinished()
to remove superfluous MSG_CANCELs
2) When processing MSG_CANCEL check whether the context is still active
3) Do JobServiceContext cleanup before calling back to JobSchedulerService
Client can get a cancel msg even after calling jobFinished() (opposite to above)
1) explicitly check whether there are any MSG_CALLBACKs in the queue before
processing a MSG_CANCEL. If there are we can throw away the cancel.

Bug: 16547638
Change-Id: I90644586c7895a9ce97de752a5d657faf7f74b78
 2014-07-29 11:11:41 -07:00
Adam Lesinski
ae9e68a349 Merge "Have AEP GL feature depend on GLES 3.1 in badging" into lmp-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
b5b3a1d30b Merge "Fix capitalization on AudioPort callback method names" into lmp-dev 2014-07-28 22:45:16 +00:00
Eric Laurent
fdaed9dcb6 Fix capitalization on AudioPort callback method names 
Change-Id: I87963ea7290989333781bf8905c9ae640c34d943
 2014-07-29 09:30:34 -07:00