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

220654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
4503d2f14a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours am: 9aa91f99b2 -s ours 
am: 4fcebfe20e  -s ours

* commit '4fcebfe20e9c7b76ebc6c14fe6adf9fef2f072f9':
  Import translations. DO NOT MERGE
 2015-10-28 15:06:50 +00:00
Geoff Mendal
4fcebfe20e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours 
am: 9aa91f99b2  -s ours

* commit '9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
  Import translations. DO NOT MERGE
 2015-10-28 15:00:44 +00:00
Geoff Mendal
9aa91f99b2 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours 
am: d2b3815dda  -s ours

* commit 'd2b3815dda57702ebbd00a6422d21a52b0604dfa':
  Import translations. DO NOT MERGE
 2015-10-28 14:52:31 +00:00
Geoff Mendal
fed5f90a16 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours am: 4c55431f51 -s ours 
am: a4993f6f2f  -s ours

* commit 'a4993f6f2f71c370b5622843ab8f2587b46d8dbd':
  Import translations. DO NOT MERGE
 2015-10-28 14:48:06 +00:00
Geoff Mendal
d2b3815dda Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: c7522c0b1c  -s ours

* commit 'c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
  Import translations. DO NOT MERGE
 2015-10-28 14:43:38 +00:00
Geoff Mendal
a4993f6f2f Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours 
am: 4c55431f51  -s ours

* commit '4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
  Import translations. DO NOT MERGE
 2015-10-28 14:39:12 +00:00
Geoff Mendal
c7522c0b1c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-28 14:38:11 +00:00
Geoff Mendal
bcefa34c3f Import translations. DO NOT MERGE 
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
 2015-10-28 07:37:31 -07:00
Geoff Mendal
bc9ce6e440 Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours am: 32076214a4 -s ours 
am: e21f906153  -s ours

* commit 'e21f906153f935a9bcdb2f7723bcdbb7b48c5bdf':
  Import translations. DO NOT MERGE
 2015-10-28 14:33:48 +00:00
Geoff Mendal
4c55431f51 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: a4f0ea406d  -s ours

* commit 'a4f0ea406d9c4de166ec65541581666e782b3846':
  Import translations. DO NOT MERGE
 2015-10-28 14:29:50 +00:00
Geoff Mendal
e21f906153 Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours 
am: 32076214a4  -s ours

* commit '32076214a40a98553a7c634d8d8a8d1eb2efb625':
  Import translations. DO NOT MERGE
 2015-10-28 14:26:00 +00:00
Geoff Mendal
a4f0ea406d Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-10-28 14:22:47 +00:00
Geoff Mendal
c3b637f8d1 Import translations. DO NOT MERGE 
Change-Id: I9c1726898d50ea8971a12ddc9fe575615682f95d
Auto-generated-cl: translation import
 2015-10-28 07:21:49 -07:00
Geoff Mendal
32076214a4 Import translations. DO NOT MERGE am: b8afc77c0a -s ours 
am: 7934d4e206  -s ours

* commit '7934d4e20603eb2aaa6f6041c932e9ef70b5612f':
  Import translations. DO NOT MERGE
 2015-10-28 14:18:25 +00:00
Geoff Mendal
7934d4e206 Import translations. DO NOT MERGE 
am: b8afc77c0a  -s ours

* commit 'b8afc77c0a20a5d4ff7d1afb060c474feeefb1fe':
  Import translations. DO NOT MERGE
 2015-10-28 14:11:00 +00:00
Geoff Mendal
b8afc77c0a Import translations. DO NOT MERGE 
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974
Auto-generated-cl: translation import
 2015-10-28 06:59:45 -07:00
Geoff Mendal
d0d316049d Merge "Import translations. DO NOT MERGE" 2015-10-28 13:03:57 +00:00
Geoff Mendal
52dfbe95c1 Import translations. DO NOT MERGE 
Change-Id: I9cadfa4b07bca2d001bef84944b1b7a226b2d3aa
Auto-generated-cl: translation import
 2015-10-28 06:02:30 -07:00
Geoff Mendal
cd3a0e17f0 Merge "Import translations. DO NOT MERGE" 2015-10-28 12:42:13 +00:00
Geoff Mendal
78210c34ab Import translations. DO NOT MERGE 
Change-Id: I9971ad4dba7f72bb883288a49020eb115e2fb34f
Auto-generated-cl: translation import
 2015-10-28 05:38:36 -07:00
Geoff Mendal
c1741a1e40 Import translations. DO NOT MERGE am: 44036023a5 -s ours am: 5d79e1b9c1 -s ours 
am: 0c79b15f31  -s ours

* commit '0c79b15f31489e5c0491fecb000608cb440c8267':
  Import translations. DO NOT MERGE
 2015-10-28 12:37:34 +00:00
Geoff Mendal
0c79b15f31 Import translations. DO NOT MERGE am: 44036023a5 -s ours 
am: 5d79e1b9c1  -s ours

* commit '5d79e1b9c1129a60663fca69892ebc14270e5d87':
  Import translations. DO NOT MERGE
 2015-10-28 12:30:10 +00:00
Geoff Mendal
5d79e1b9c1 Import translations. DO NOT MERGE 
am: 44036023a5  -s ours

* commit '44036023a574fa8526c6b436ff5309d5939c94cd':
  Import translations. DO NOT MERGE
 2015-10-28 12:21:45 +00:00
Geoff Mendal
44036023a5 Import translations. DO NOT MERGE 
Change-Id: I0fba6c467156c09874291320bf9f18d13e4ba466
Auto-generated-cl: translation import
 2015-10-28 05:13:26 -07:00
Erik Kline
7ae47acb0b Merge "Also treat loss of IPv6 as a loss of provisioning." 2015-10-28 07:07:51 +00:00
Daniel Sandler
556c8e6466 Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours am: 638003c4fd 
am: df8b5a48cb

* commit 'df8b5a48cb6e155688e4ab95fc24187fa3ef8027':
  Petites fautes.
 2015-10-28 03:38:12 +00:00
Daniel Sandler
df8b5a48cb Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 am: 21858e56d6 -s ours 
am: 638003c4fd

* commit '638003c4fdf959686ba35d19cb99805d3c5f578c':
  Petites fautes.
 2015-10-28 03:30:40 +00:00
Daniel Sandler
638003c4fd Merge "Petites fautes." into mnc-dr-dev am: da43cc0a21 
am: 21858e56d6  -s ours

* commit '21858e56d640109e36b2f02e244e125adf37020c':
  Petites fautes.
 2015-10-28 03:21:35 +00:00
Dianne Hackborn
f13e732d55 Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 am: 26654c92ca am: 40bced1d6e 
am: 24f2cca6ed

* commit '24f2cca6ed3582326fd52df18ff28a8f85394377':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.
 2015-10-28 02:15:23 +00:00
David Christie
e978607ac3 Merge "Make Location objects take less memory." 2015-10-28 01:27:37 +00:00
Winson
38c96cb834 Fixing build breakage. 
Change-Id: I0a0ef36b9724fc2e51c545a405b23d261cc85c4f
 2015-10-27 18:25:02 -07:00
David Christie
923b260258 Make Location objects take less memory. 
-Use bitmask for has*** methods.
-Use ThreadLocal for caching intermediate computations
 rather than preallocating memory in every Location

Change-Id: If2fa17bfd59511ec0b809f4b7d7cd8028360c340
 2015-10-27 18:09:53 -07:00
Svetoslav
a7473a671c Installer can override system or policy 
The installer can grant permissions at install/update. It
can wrongly override system and policy and grant permissions
explicitly revoked by the system or device/profile owner.

bug:25323455

Change-Id: Ica4241bfdef753e1d6cb80692c6b375300a05459
 2015-10-28 01:01:00 +00:00
Vladislav Kaznacheev
56f0720fd7 Merge " Add PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT" 2015-10-28 00:59:06 +00:00
Erik Kline
d9023cff5d Merge "Make all IpReachabilityMonitor log messages have the same tag" 2015-10-28 00:43:34 +00:00
Vladislav Kaznacheev
d303b25ad3 Add PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT 
Bug: 25329519

Change-Id: Ib09cb2332ee1810b2f774a8453fe519fa920cd5d
 2015-10-27 17:30:58 -07:00
Filip Gruszczynski
ab253faa47 Merge "Fix wrong task bounds when docking from recents." 2015-10-28 00:01:28 +00:00
Makoto Onuki
e9ef528ec7 Merge "Layer user restrictions" 2015-10-27 22:49:04 +00:00
Daichi Hirono
decb832094 Merge "Show MTP roots at the bottom of root list." 2015-10-27 22:46:51 +00:00
Winson Chung
0f6cb2d7d1 Merge "Passing stack id with RunningTaskInfo." 2015-10-27 21:42:57 +00:00
Winson
5510f6c1b9 Passing stack id with RunningTaskInfo. 
- This allows us to remove an extraneous system call when starting 
  overview, and also allows us to easily check for freeform windows.

Change-Id: I4449dad7bf870f528f671f6e7cb1f9b5f1bc9c1c
 2015-10-27 21:42:37 +00:00
David Christie
0458283243 Merge "Correct range checking for location strings during conversion" 2015-10-27 21:38:12 +00:00
Makoto Onuki
068c54a5be Layer user restrictions 
- Now DPMS remembers user restrictions set by DO / PO in their ActiveAdmin.

- User restrictions set by DO/PO will no longer be saved by UserManger.  Instead,
when needed, UMS will consult DPMS to build "effective" user restrictions.

- UM.getUserRestrictions() will now always return "effective" user restrictions.

- DPMS migrates existing user restrictions per the eng spec.

- Also now UM.setUserRestrictions() will crash.  UMS.setUserRestrictions() has
been removed.
This was needed because UM.setUserRestrctions(UM.getUserRestrictions()) will no
longer be a valid use like it used to be.

- Also introduced a fined-grained lock for user restrictions in UM to avoid
deadlock between DPMS and also for better performance.

Bug 23902097

Change-Id: If0e1e49344e2f3e9226532d00777976d1eaa7df3
 2015-10-27 14:26:06 -07:00
David Christie
5575ddfcc1 Correct range checking for location strings during conversion 
Minute values in the range [0, 59] are valid if seconds are
present. If seconds are not present then minute values are
valid in the range [0, <60]

Second values are valid in the range [0, <60]

Examples:
50:59:59.99999 is valid
50:59.99999 is valid
50:59.1:1 is not valid

Patch taken from Motorola: partner gerrit 137210

Bug: 17958582
Change-Id: I0d1265534092157883af564119f723984362d436
Issues: 2667 and 2668
 2015-10-27 14:13:03 -07:00
Julia Reynolds
7fef1888d1 Merge "Stop populating RemoteViews in Notifications." 2015-10-27 20:36:31 +00:00
Dianne Hackborn
24f2cca6ed Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 am: 26654c92ca 
am: 40bced1d6e

* commit '40bced1d6ed2dadbd1fff116dad382582c430297':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.
 2015-10-27 20:04:49 +00:00
Daniel Sandler
21858e56d6 Merge "Petites fautes." into mnc-dr-dev 
am: da43cc0a21

* commit 'da43cc0a2150a1c74340b75c919425e2a3f5b6fe':
  Petites fautes.
 2015-10-27 20:00:01 +00:00
Dianne Hackborn
40bced1d6e Fix issue #25289999: Lower device idle alarm limit to 10 mins. am: 7682b26ea1 
am: 26654c92ca

* commit '26654c92caf3d5443e2d7a50fc3573e8d81446d8':
  Fix issue #25289999: Lower device idle alarm limit to 10 mins.
 2015-10-27 19:55:02 +00:00
Winson
463ba436d2 Fixing minor regression with system bar scrims. 
Change-Id: I0cf508c26b3a71c604a3061b05abb47cac5a9bb2
 2015-10-27 19:51:47 +00:00
Daniel Sandler
da43cc0a21 Merge "Petites fautes." into mnc-dr-dev 2015-10-27 19:51:31 +00:00