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

202915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
1c4c740d7f am 97e77627: Merge commit \'9dd2663d\' into mm 
* commit '97e776278271b3ce90aadb170045283c6bd7debb':
  DO NOT MERGE. Add new media navigation keys.
 2015-08-07 18:24:16 +00:00
Michael Wright
97e7762782 Merge commit '9dd2663d' into mm 
Change-Id: Idf37dbc3bba970817e6620fe0129e54e86f553d5
 2015-08-07 19:13:34 +01:00
Michael Wright
9dd2663db4 am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev 
* commit 'd7255cfb1cf8dc7249632d93d68daac8cc2c7b9c':
  DO NOT MERGE. Add new media navigation keys.
 2015-08-07 17:53:17 +00:00
Michael Wright
d7255cfb1c Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev 2015-08-07 16:52:27 +00:00
Svetoslav Ganov
5ed0338499 am 1f514608: am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '1f514608875282fece4198bdf502e0b0060b8fc8':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:48:30 +00:00
Svetoslav Ganov
1f51460887 am 5a624aad: am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '5a624aad5faa0a71ce6495671caac1ccd90544ba':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:40:35 +00:00
Svetoslav Ganov
5a624aad5f am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 
* commit '38d30dc547825bdde2756f588692063a28749e8d':
  Immediately kill a shared user process on a permission revocation.
 2015-08-07 15:33:48 +00:00
Svetoslav Ganov
38d30dc547 Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev 2015-08-07 15:27:49 +00:00
Jason Monk
2ba9fc1ba7 am e810b397: am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit 'e810b397471d786a3281de117db5a104365e719d':
  Use BluetoothController for status bar icon status
 2015-08-07 15:01:15 +00:00
Jason Monk
e810b39747 am 49541edb: am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit '49541edbdbffb2058eed822675c5df5ccb9a7ba6':
  Use BluetoothController for status bar icon status
 2015-08-07 14:50:56 +00:00
Jason Monk
49541edbdb am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev 
* commit '77566dd1e15353eb062503767c6e4a354303fd09':
  Use BluetoothController for status bar icon status
 2015-08-07 14:44:22 +00:00
Jason Monk
77566dd1e1 Merge "Use BluetoothController for status bar icon status" into mnc-dev 2015-08-07 14:38:29 +00:00
Michael Wright
600b984760 DO NOT MERGE. Add new media navigation keys. 
Bug: 22059484
Change-Id: Ifd8fd18178fed45ead2980b957dd1d177e40f165
 2015-08-07 14:46:05 +01:00
Jeff Davidson
2fe5137315 am 22d20774: am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '22d207747f4931179e5599e1a8006822fb9b182b':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 02:02:38 +00:00
Jeff Davidson
22d207747f am 20de377b: am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '20de377beb17273a2d2dcd5715c418eec1ac897e':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:55:07 +00:00
Svetoslav
aa41add33b Immediately kill a shared user process on a permission revocation. 
1. When a permission is revoked we kill the app immediately but do
   not do an immediate kill for shared uid processes. This fixes it.

2. Remove system APIs that are used only by the package installer.

bug:22984670

Change-Id: I3d4ae52ea8679f894aa7c5972941263903479183
 2015-08-06 18:47:41 -07:00
Jeff Davidson
20de377beb am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 
* commit '1d7c32548c30c62a35c54a624f89d5f9db31b9d4':
  Correctly propagate permissions when uninstalling updates.
 2015-08-07 01:46:58 +00:00
Jeff Davidson
1d7c32548c Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev 2015-08-07 01:39:14 +00:00
Wale Ogunwale
4aaafab50f am 10068894: am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. 
* commit '10068894a2a12651e3ddb4d64a6120d994846dbf':
  Look for recent tasks in live stacks.
 2015-08-07 01:28:49 +00:00
Wale Ogunwale
10068894a2 am 60f7eb38: am a0ef49c4: Look for recent tasks in live stacks. 
* commit '60f7eb38a9afdae504ce4412afe862e759fd8ff3':
  Look for recent tasks in live stacks.
 2015-08-07 01:23:01 +00:00
Wale Ogunwale
60f7eb38a9 am a0ef49c4: Look for recent tasks in live stacks. 
* commit 'a0ef49c44f7d845e3465591ea977d0c9996c4e5e':
  Look for recent tasks in live stacks.
 2015-08-07 01:13:35 +00:00
Wale Ogunwale
a0ef49c44f Look for recent tasks in live stacks. 
It is possible for a tasks not to have been saved to the
persisted recent list yet for various reasons. This causes
some external calls to fail when they are trying to do
an operation on a task with a given id. We now use the
stack supervisor look-up for a task id that checks
everywhere a task might be including live stack. It this
fails then the task truly doesn't exist.

Bug: 22924782
Change-Id: I57c3df41d0b4f3ee3c5ae9b7d01eeb2b352062b4
 2015-08-07 00:26:01 +00:00
Deepanshu Gupta
c344ac576f am fbdf2032: am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 
* commit 'fbdf2032549e1d2b003f228374a69a0b4dca6ce2':
  LayoutLib: Switch SimpleDateFormat to icu.
 2015-08-06 23:53:58 +00:00
Deepanshu Gupta
fbdf203254 am cfe5778d: am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 
* commit 'cfe5778de871615e8b78bbabb5404dc136774be8':
  LayoutLib: Switch SimpleDateFormat to icu.
 2015-08-06 23:42:02 +00:00
Deepanshu Gupta
63790291a4 am 2081769f: am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev 
* commit '2081769f4c6128bf3e8af29643aaf5f8da0902d8':
  Replace Locale.getDefault with custom impl.
 2015-08-06 23:38:42 +00:00
Deepanshu Gupta
cfe5778de8 am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 
* commit '8f26616d1a1765267d6a3ba09e7ac1bd6edeca67':
  LayoutLib: Switch SimpleDateFormat to icu.
 2015-08-06 23:32:27 +00:00
Deepanshu Gupta
2081769f4c am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev 
* commit '618d96da7893fad4012353233c1c45db4e9d62ba':
  Replace Locale.getDefault with custom impl.
 2015-08-06 23:26:38 +00:00
Deepanshu Gupta
8f26616d1a Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev 2015-08-06 23:26:01 +00:00
Deepanshu Gupta
618d96da78 am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev 
* commit '385ce0a31dbdd4b4b1865755dbc4af157f72481c':
  Replace Locale.getDefault with custom impl.
 2015-08-06 23:16:25 +00:00
Deepanshu Gupta
385ce0a31d Merge "Replace Locale.getDefault with custom impl." into mnc-dev 2015-08-06 23:08:46 +00:00
Deepanshu Gupta
b556decf75 LayoutLib: Switch SimpleDateFormat to icu. 
Use ICU's implementation of SimpleDateFormat in LayoutLib. The format
patterns used are not supported by java.text.SimpleDateFormat.

The change required adding a mechanism for promoting visibility of
fields in the framework in the create tool.
TODO: Add additional tests in the create tool for this new
functionality.

Change-Id: Id0f4be41f9731c42a28919c32cc5ef271a656982
 2015-08-06 16:04:04 -07:00
Deepanshu Gupta
82c7fdb1f6 Replace Locale.getDefault with custom impl. 
In LayoutLib the default locale should always be the locale set the
rendering params. This change replaces all calls to Locale.getDefault in
the framework with calls to AndroidLocale.getDefault() which tries to
find the locale from the current context, but falls back to the original
call.

Change-Id: I496b35dcfc17fd61fedee21c7495541ab870b1fc
 2015-08-06 16:03:19 -07:00
Andres Morales
981c456170 am 7ab11e45: am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '7ab11e45bd2be1a67e446aecf8e2da4b2209510b':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:41:47 +00:00
Andres Morales
7ab11e45bd am 5fd47543: am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '5fd4754310a9b19c7b880197e5bd237e2959c040':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:36:08 +00:00
Andres Morales
5fd4754310 am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 
* commit '85c73c40d1fd76e8a7bbd90ab80458082764c1c3':
  [UserManager] expose method to retrieve credential owner
 2015-08-06 22:30:59 +00:00
Andres Morales
85c73c40d1 Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev 2015-08-06 22:22:17 +00:00
Winson Chung
1353b0f5e6 am 6bf21c3a: am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit '6bf21c3a06c9f08a650d5f2aadd29389c636fb1e':
  Fixing issue with empty Recents screen.
 2015-08-06 22:08:33 +00:00
Winson Chung
6bf21c3a06 am b762a9a5: am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'b762a9a579eb4dd8f58932d4f1284cae7727cd00':
  Fixing issue with empty Recents screen.
 2015-08-06 22:01:25 +00:00
Winson Chung
b762a9a579 am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev 
* commit 'bb55aa1a93cee91a40b6f5941675682cb6f8a83b':
  Fixing issue with empty Recents screen.
 2015-08-06 21:53:03 +00:00
Wei Jia
d385c56dc3 am 9bf7f2a4: am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit '9bf7f2a41f32d4ffb2e5b557a6c79fc4460c4576':
  MediaSync: fix API comments.
 2015-08-06 21:51:48 +00:00
Winson Chung
bb55aa1a93 Merge "Fixing issue with empty Recents screen." into mnc-dev 2015-08-06 21:44:17 +00:00
Wei Jia
9bf7f2a41f am be30c10e: am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'be30c10ede99b8ca971af4d735d6c0e42778879b':
  MediaSync: fix API comments.
 2015-08-06 21:43:05 +00:00
Wei Jia
be30c10ede am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev 
* commit 'a89e9f6d3207527888d7fab191ddbe92ff68fc79':
  MediaSync: fix API comments.
 2015-08-06 21:37:22 +00:00
Wei Jia
a89e9f6d32 Merge "MediaSync: fix API comments." into mnc-dev 2015-08-06 21:31:22 +00:00
Jason Monk
7036436014 Use BluetoothController for status bar icon status 
Bug: 22819904
Change-Id: I6ca11c57431f8e930a47144090158363175a3b99
 2015-08-06 16:43:59 -04:00
Wei Jia
5d177fff2f MediaSync: fix API comments. 
Bug: 23008551

Change-Id: Ifbf1970c174b54a761d4672d954ee5633adbf3d6
 2015-08-06 12:51:36 -07:00
Winson
76ffdafc3c Fixing issue with empty Recents screen. 
- We did not expect RecentsActivity to be launched without going through
  the normal SystemUI controls, but when the home activity is in the foreground
  and killed (via a normal apk update), the RecentsActivity stores the old
  launch configuration and believes that it was launched from home and awaits
  the animation-complete callback to animate the tasks in.
- This CL adds a workaround where the configuration is reset whenever
  RecentsActivity is stopped, which allows the tasks to be shown immediately
  if the User is kicked back into Recents due to an update.

Bug: 22542869
Change-Id: I2b4168ccecfbf868fa6d544fe89109dfa74f51df
 2015-08-06 12:51:26 -07:00
Jeff Sharkey
48697332c7 am 0c2df694: am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit '0c2df6944c83eee291f3b8e588eed7adba401d46':
  Protect runtime storage mount points.
 2015-08-06 19:49:35 +00:00
Jeff Sharkey
0c2df6944c am 7d28ad9b: am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit '7d28ad9b638a8184ab499cbe708d3427025e569b':
  Protect runtime storage mount points.
 2015-08-06 19:43:57 +00:00
Jeff Sharkey
7d28ad9b63 am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev 
* commit 'cb54ffb2cb9583eaf6b58dcc636681c4e4e07a7d':
  Protect runtime storage mount points.
 2015-08-06 19:36:01 +00:00