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

152239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
39011698dd 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:45 +00:00
Amit Mahajan
d422df7928 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:41 +00: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
Christoph Studer
4a7e846353 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:27 +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
976a3be200 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:10 +00:00
Jeff Sharkey
c1cdd4bda3 Merge "Only revoke ownerless grants when unprivileged." into lmp-dev 2014-09-19 16:32:52 +00:00
Alan Viverette
c973202559 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:27 +00:00
Alan Viverette
e68bc7ab73 Merge "Delete file containing removed attributes and styles" into lmp-dev 2014-09-19 16:21:01 +00:00
John Spurlock
e00e69c583 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:16:48 +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
71c8a70eff Merge "When dozing, re-enable falsing threshold and log events." into lmp-dev 2014-09-19 16:04:36 +00:00
Amith Yamasani
70a2afd10e 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:59 +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
Baligh Uddin
77e3ba2bcd am 45e72ffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '45e72ffc04c51bb5c57166e9c3fbd99e0874f3bf':
  Import translations. DO NOT MERGE
 2014-09-19 15:50:52 +00:00
George Mount
6ac3f38143 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:50:48 +00:00
George Mount
a667d5dc5e 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:50:44 +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
Baligh Uddin
eadf58d56e Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-19 15:41:59 +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
1f203b3ae6 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:31 +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
676e7251e0 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:32:19 +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
3a4e05d136 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:53 +00:00
Paul Jensen
7bfa35742a Merge "Fix to make repeated lingerings work." into lmp-dev 2014-09-19 11:59:50 +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
Kenny Guy
57224fae58 am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev 
* commit '4996d6a4ff983167133779a78bad4282d8bce4b3':
  Remove suggested key names as its confusing.
 2014-09-19 09:55:37 +00:00
Kenny Guy
52ee328054 Merge "Remove suggested key names as its confusing." into lmp-dev 2014-09-19 09:44:23 +00:00
Christoph Studer
365e4c38d5 Remove FLAG_FOREGROUND_SERVICE on Service.stopForeground() 
When services call Service.stopForeground(), remove
FLAG_FOREGROUND_SERVICE from the notification that was supplied
to Service.startForeground().

This enables services to post notifications that become user
dismissable when they switch to being a background service.

Restrict this to targetSdk=L apps to reduce the risk of breaking
existing apps.

Bug: 17551106
Change-Id: Iff8541e5bb2a23ad1fbc9ad80df5fd6eb683148b
 2014-09-19 09:53:12 +02:00
Yohei Yukawa
2b6307c894 am 8e1c6a06: Merge "Speculative fix of IMMS crash" into lmp-dev 
* commit '8e1c6a06dcd32faf10b9bdc9c9eb0d6cc055b7e5':
  Speculative fix of IMMS crash
 2014-09-19 06:21:05 +00:00
Dan Sandler
103daa0c49 am c990927b: Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 
* commit 'c990927be5a90d0c8d0ad6d8b9e75d8b15cc717c':
  Fix LayoutInflater copy constructor logic.
 2014-09-19 05:29:34 +00:00
Yohei Yukawa
d66a7324cc Merge "Speculative fix of IMMS crash" into lmp-dev 2014-09-19 05:19:04 +00:00
Yohei Yukawa
fcedfa0190 Speculative fix of IMMS crash 
This CL is a follow up CL for I6571d464a46453934f0a8f5e790.

Do not propagate Resources.NotFoundException to the caller
of InputMethodInfo.isDefault().

BUG: 17553712
BUG: 17549437
BUG: 17517332

Change-Id: Ie95880c1f68f49eb63518e69b7dfa20af3ce8737
 2014-09-19 05:02:59 +00:00
Dianne Hackborn
f2cf16436b am 31ce4c62: Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 
* commit '31ce4c62e97cf7357707c894f6992f52a43c6c9d':
  Fix issue #17564607: Apps in the managed profile can send any intent...
 2014-09-19 04:17:41 +00:00
Mike Lockwood
28c167134b am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 
* commit '52e5e3599151c01a8107f08238ce1c59d8ec2fe1':
  USB string descriptors are not UTF8, so it is not safe to treat them as such.
 2014-09-19 04:17:36 +00:00
Alan Viverette
1b3c0f82ee am d03ba30b: Merge "Always apply window insets to action modes" into lmp-dev 
* commit 'd03ba30bac5d250cdc7d43102dd06af2f114d7a8':
  Always apply window insets to action modes
 2014-09-19 04:09:08 +00:00
Amit Mahajan
e3e1d90e5f am 010bdd3c: Merge "Fix voice mail number to modify when insert H3G Denmark sim card." into lmp-dev 
* commit '010bdd3c2f68e01ba244baf036b2e952afb99bbf':
  Fix voice mail number to modify when insert H3G Denmark sim card.
 2014-09-19 04:09:03 +00:00
Yigit Boyar
6a0c7b1ba8 am 6cdaab18: Merge "Fix scroll position calculation when clipToPadding is false" into lmp-dev 
* commit '6cdaab18f323108f599d54d636f8fcc9bd7af278':
  Fix scroll position calculation when clipToPadding is false
 2014-09-19 04:08:55 +00:00
Dan Sandler
20d01ad8a1 Merge "Fix LayoutInflater copy constructor logic." into lmp-dev 2014-09-19 03:32:31 +00:00
Dan Sandler
0c7bb33e03 Fix LayoutInflater copy constructor logic. 
Avoids an NPE in mFilterMap.

Bug: 17548265
Change-Id: I6556373862f706dbcf5549eaec61c3e10a47b482
 2014-09-18 22:23:32 -04:00
Dianne Hackborn
aad42d1204 Merge "Fix issue #17564607: Apps in the managed profile can send any intent..." into lmp-dev 2014-09-19 02:01:58 +00:00
Dianne Hackborn
ace27915d2 Fix issue #17564607: Apps in the managed profile can send any intent... 
...to the primary user, even if it was not whitelisted to be forwarded.

The path where getActivityInfo is called for the ResolverActivity
would not correctly apply the requested user ID to the result, so
it wouldn't run under the correct user.

Change-Id: I1da47c54bbed26091832a28236d0b06762c92437
 2014-09-18 19:01:01 -07:00
Mike Lockwood
51938c205f Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev 2014-09-19 02:00:26 +00:00
w19976
6f006cce75 Handling service number convert while roaming. 
When roaming, change *611 to +19085594899.

Bug: 17202092
Change-Id: Ibd130911131e9ed245cca7130853176f831e361e
 2014-09-19 01:36:15 +00:00