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

156660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
d9f46de199 am 340ccfe0: Merge "glFinish to flush deletes" into lmp-dev 
* commit '340ccfe0fc65803b56d68c2b067a5198c14d0f6f':
  glFinish to flush deletes
 2014-09-19 17:26:44 +00:00
Jason Monk
15b49e05f2 am 8598377b: Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev 
* commit '8598377bc58cb62c179c0ae5cd380842604b041b':
  QS: Fix accessibility announce for dual tiles
 2014-09-19 17:26:40 +00:00
Amit Mahajan
67055b9a4a am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev 
* commit '9391ee9e8b9f0daab2fd7a42189e3deac96c0e48':
  Handling service number convert while roaming.
 2014-09-19 17:26:35 +00:00
Adam Powell
2b2f6729b8 Merge "Make panel menu windows respect elevation" into lmp-dev 2014-09-19 17:25:34 +00:00
Alan Viverette
0158b82262 Fix action bar title size consistency 
BUG: 17582193
Change-Id: I7dfe9229361dcd52893fd96e1e8f9a006d7ffad3
 2014-09-19 10:23:34 -07:00
John Reck
6cc6219f6f Merge "glFinish to flush deletes" into lmp-dev 2014-09-19 17:22:17 +00:00
Alan Viverette
bb696dcca9 Fix radial time picker inner circle (1-12) selections 
Result of a poorly collapsed set of if block conditionals.

BUG: 17580782
Change-Id: I7f7e5038f943d1f49e1541acfa282479cb2505ea
 2014-09-19 10:20:45 -07:00
Jason Monk
33d326d133 Merge "QS: Fix accessibility announce for dual tiles" into lmp-dev 2014-09-19 17:19:40 +00:00
Amit Mahajan
df22548d3a Merge "Handling service number convert while roaming." into lmp-dev 2014-09-19 17:12:33 +00:00
John Reck
4ced2620b7 glFinish to flush deletes 
Bug: 17479800
Change-Id: I4d4a3eeda510e037f806052025184f3cde18c847
 2014-09-19 10:10:19 -07:00
Christoph Studer
9dbf5e4ffa am da2cec35: am 82485096: Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev 
* commit 'da2cec352cec5f4b66173407dbca315a401286fb':
  Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
 2014-09-19 17:07:14 +00:00
Jeff Sharkey
e0ce04ec02 am c0b3f2bd: am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev 
* commit 'c0b3f2bd28c8efd5bc594e35eb92a9ff18d3b3e5':
  Only revoke ownerless grants when unprivileged.
 2014-09-19 16:56:42 +00:00
Christoph Studer
2951fef68a am 82485096: Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev 
* commit '82485096da29e452a7e066c949b609c2f72e063d':
  Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()
 2014-09-19 16:54:25 +00:00
Christoph Studer
bc46c83073 Merge "Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground()" into lmp-dev 2014-09-19 16:43:47 +00:00
Jeff Sharkey
156e072b75 am e6c4fb00: Merge "Only revoke ownerless grants when unprivileged." into lmp-dev 
* commit 'e6c4fb00791653ab12302b16dedb2e9696bd0103':
  Only revoke ownerless grants when unprivileged.
 2014-09-19 16:41:08 +00:00
Alan Viverette
543c0d772c am 633f27ca: am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev 
* commit '633f27cad3ad81939466f8ee701466083c452d44':
  Delete file containing removed attributes and styles
 2014-09-19 16:34:44 +00:00
Jeff Sharkey
c1cdd4bda3 Merge "Only revoke ownerless grants when unprivileged." into lmp-dev 2014-09-19 16:32:52 +00:00
John Spurlock
dc69c03bff am 7bc8920e: am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit '7bc8920eada5fd6edea4e7010caeb25eef80203d':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 16:27:56 +00:00
Alan Viverette
1a37f9b74c am 9cfe1e3c: Merge "Delete file containing removed attributes and styles" into lmp-dev 
* commit '9cfe1e3c2785b78da86f450b9240b743842e65c2':
  Delete file containing removed attributes and styles
 2014-09-19 16:27:21 +00:00
Alan Viverette
e68bc7ab73 Merge "Delete file containing removed attributes and styles" into lmp-dev 2014-09-19 16:21:01 +00:00
Jeff Sharkey
29b2516012 Only revoke ownerless grants when unprivileged. 
Recently we relaxed revokeUriPermission() to allow apps to revoke
Uri permissions that had been granted to them, but this uncovered
bugs in apps that had been relying on the previous no-op behavior.

To mitigate this, only revoke ownerless Uri permissions when in the
unprivileged state; an active owner indicates that another component
of the calling app still needs the permission.

Bug: 17554268
Change-Id: Icc412933b29041ffb699d20136a623440ecc71ec
 2014-09-19 09:15:45 -07:00
John Spurlock
6e269a8c65 am 933e8411: Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 
* commit '933e841121f91329bd4273cbffe1ed510db76314':
  When dozing, re-enable falsing threshold and log events.
 2014-09-19 16:15:45 +00:00
Amith Yamasani
bd59ae2597 am d2484f81: am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'd2484f8198e11d20eca624b1192cb63d9b78d9ec':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:09:17 +00:00
John Spurlock
71c8a70eff Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 2014-09-19 16:04:36 +00:00
Baligh Uddin
e7a0b758b3 am bffca9c6: (-s ours) am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'bffca9c65ee72d552176ecec328536826e1d05f5':
  Import translations. DO NOT MERGE
 2014-09-19 16:03:25 +00:00
George Mount
4e049e59f2 am 156e8dd2: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit '156e8dd238af85224df15a80bc43c47bdff3f2ba':
  Fix exception when fragment container has no View.
 2014-09-19 16:03:20 +00:00
George Mount
392251f06e am aeebb25c: am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit 'aeebb25c9d29e1768effff0d90df4ec1426554f3':
  Fix NPE when shared element listener is null.
 2014-09-19 16:03:15 +00:00
Amith Yamasani
0178ecfa43 am ba108d11: Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 
* commit 'ba108d1178a1e7863d757fd146ae8d485088c5bc':
  Allow primary user profile owner to set device restrictions
 2014-09-19 16:02:04 +00:00
Baligh Uddin
ce179a2c5a am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '45e72ffc04c51bb5c57166e9c3fbd99e0874f3bf':
  Import translations. DO NOT MERGE
 2014-09-19 15:54:16 +00:00
George Mount
edbffaadf9 am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev 
* commit 'f187823e02c34118ed6de23f844a043d3a64829c':
  Fix exception when fragment container has no View.
 2014-09-19 15:54:11 +00:00
Chris Craik
f559326b18 Hide other color filter mutability 
bug:17262092
Change-Id: Ia6c0e1a684365c372803d1a6be41a478a05e0dd0
 2014-09-19 08:54:09 -07:00
George Mount
5abffd26b3 am 04a96bca: Merge "Fix NPE when shared element listener is null." into lmp-dev 
* commit '04a96bcad89cf917a57980cb77a90763f43b5b94':
  Fix NPE when shared element listener is null.
 2014-09-19 15:54:06 +00:00
Amith Yamasani
8d9f121618 Merge "Allow primary user profile owner to set device restrictions" into lmp-dev 2014-09-19 15:51:39 +00:00
Chris Craik
4bc87627a4 am 658a7846: am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '658a7846cac4235653fe264c09182302262971ae':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:50:47 +00:00
John Spurlock
813552cc27 When dozing, re-enable falsing threshold and log events. 
- Reactivate our configured keyguard falsing swipe threshold
  for secure keyguards, but only when dozing.
- Add DozeLog helper to capture/maintain interesting events
  about the doze + unlock process, enabled by default, but
  only on devices that start dozing at least once.
- Dump summary counts + logged events to dumpsys output.
- Pass notification pulse "instance" as an extra to the scheduled
  intent, so we can log accordingly.

Bug:17496795
Change-Id: I7e88f93bfc967bdc06550cf1fe5e74d535edd774
 2014-09-19 11:47:30 -04:00
Baligh Uddin
585391803e Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-19 15:42:01 +00:00
George Mount
8f8f5f579f Merge "Fix exception when fragment container has no View." into lmp-dev 2014-09-19 15:39:45 +00:00
George Mount
a1e7d53b0a Merge "Fix NPE when shared element listener is null." into lmp-dev 2014-09-19 15:39:03 +00:00
Chris Craik
7f9b493a7f am 969b5ff4: Merge "Fix garbage showing up beneath dialogs" into lmp-dev 
* commit '969b5ff492aae38fb89c98b2411e217e9b11638e':
  Fix garbage showing up beneath dialogs
 2014-09-19 15:38:25 +00:00
Chris Craik
651486d018 Merge "Fix garbage showing up beneath dialogs" into lmp-dev 2014-09-19 15:31:18 +00:00
Alan Viverette
0e164aec2c Delete file containing removed attributes and styles 
These were already removed from public.xml, so this change does
not affect current.txt or public resource IDs.

BUG: 17577849
Change-Id: I3a754e968732705e5facfbc96e6e14c901d08596
 2014-09-19 15:24:30 +00:00
Jessica Hummel
419359c5be am 05b0413c: am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit '05b0413ce7327efc9f9fdf4cc960b73d925a580f':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:43:09 +00:00
Jessica Hummel
7b6e86f6bc am a38239d3: Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 
* commit 'a38239d39e2f71e54352001980863ca81cbbac41':
  bug fix: Allow enableSystemApps to be called by profile and device owner.
 2014-09-19 14:31:43 +00:00
Jessica Hummel
ccfa1a9799 Merge "bug fix: Allow enableSystemApps to be called by profile and device owner." into lmp-dev 2014-09-19 14:22:43 +00:00
Jason Monk
ec81d38d12 QS: Fix accessibility announce for dual tiles 
Bug: 17512411
Change-Id: I3515804fce2742e9553d65dab9693ccc0b9f39cf
 2014-09-19 09:52:47 -04:00
Paul Jensen
44cec4f0b5 am c90173f6: am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit 'c90173f6eb4104c46ffcce7f55895b9a43f1a750':
  Fix to make repeated lingerings work.
 2014-09-19 12:22:00 +00:00
Paul Jensen
713a6ab34a am 2620499a: Merge "Fix to make repeated lingerings work." into lmp-dev 
* commit '2620499ad2dcb2c0891c85ab32f86a5c7823d336':
  Fix to make repeated lingerings work.
 2014-09-19 12:10:42 +00:00
Paul Jensen
7bfa35742a Merge "Fix to make repeated lingerings work." into lmp-dev 2014-09-19 11:59:50 +00:00
Kenny Guy
1167e5b85a am 2481b7f3: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '2481b7f34226e11754b933d4d93e101365e859cb':
  Remove suggested key names as its confusing.
 2014-09-19 10:06:34 +00:00
Jessica Hummel
dd31a10c7f bug fix: Allow enableSystemApps to be called by profile and device owner. 
We had an additional check for managed profile in there, so it wasn't working for device owners. Also needed to look at uninstalled packages.

Change-Id: I4813f23b00d7905e92ade582ce082a6f295a322d
Bug: 17384318
 2014-09-19 09:56:19 +00:00