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

23755 Commits

Author SHA1 Message Date
Shreyas Basarge
4aa78554df NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 
am: 242bdb6d5b

* commit '242bdb6d5bec6e42b7caf42fd08ded0accc70fb8':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:53:57 +00:00
Shreyas Basarge
242bdb6d5b NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d 
am: 5e4e02b009

* commit '5e4e02b00999db4513f43d5ddfdd2c71212cc503':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:45:01 +00:00
Shreyas Basarge
5e4e02b009 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 
am: 6fc321a66d

* commit '6fc321a66d74401e00b2203817f75e29a0426ab7':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:37:34 +00:00
Shreyas Basarge
6fc321a66d NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 
am: eec587edf1

* commit 'eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:27:25 +00:00
Shreyas Basarge
eec587edf1 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 
am: 58048c1f17

* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:01:10 +00:00
Shreyas Basarge
58048c1f17 NPE fix for SyncStorageEngine read authority am: a962d9eba7 
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 00:47:41 +00:00
Shreyas Basarge
a962d9eba7 NPE fix for SyncStorageEngine read authority 
Add a null check after an authority is read
from disk.

Bug: 26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
 2016-02-19 23:38:33 +00:00
Matthew Williams
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-21 14:15:11 +00:00
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389 Redact Account info from getCurrentSyncs 
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-20 00:02:58 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 2015-11-19 15:59:42 +00:00
Sreeram Ramachandran
f1f45fe012 Don't use framework permission strings for netd permissions. 
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839120da543ee186cf25ce6e215423e99)
 2015-11-18 17:04:18 +00:00
Matthew Williams
c455148edc Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f 
am: 6d13650c74

* commit '6d13650c74b7cab047e43a4a3a0b880a832dd2db':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:03:01 +00:00
Matthew Williams
6d13650c74 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 
am: a0d20db02f

* commit 'a0d20db02f0e6cfc06ec37cfc68ce626dd35858a':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:56:30 +00:00
Matthew Williams
a0d20db02f Sync extras bundle comparison can throw NPE am: c0f39c1ece 
am: 34b700a7c2

* commit '34b700a7c2355f1dbea4b8d796619033bdd87a0c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:11 +00:00
Matthew Williams
34b700a7c2 Sync extras bundle comparison can throw NPE 
am: c0f39c1ece

* commit 'c0f39c1ece72a05c796f7ba30b7a2b5b580d5025':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +00:00
Matthew Williams
c0f39c1ece Sync extras bundle comparison can throw NPE 
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c8403354a985258c098681067e74b9e2f638)
 2015-11-11 14:34:04 +00:00
Paul Jensen
554cecea4c am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '10a7d7449dae2aabf4f22f980e7efabf274a939a':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:33:13 +00:00
Paul Jensen
10a7d7449d am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:21:22 +00:00
Paul Jensen
96cd7c14b5 am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit '635f871132449bea7489f6a61276979beeee5591':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:13:40 +00:00
Paul Jensen
635f871132 am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev 
* commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1':
  Fix NOT_RESTRICTED network capability and enforce it.
 2015-09-23 11:06:27 +00:00
Zach Jang
63348ae457 am 11317e82: am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '11317e82cf561597bbd4e2dbf5840854e6b7a16d':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:56:57 +00:00
Zach Jang
1b06455e44 am 00db0826: am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '00db0826561b23a54db28ed5203fd7eff79c16c7':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:56:52 +00:00
Zach Jang
11317e82cf am 32a420ea: Merge "Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""" into lmp-mr1-dev 
* commit '32a420ea36fbae07484f6fcf718ed97865ca3158':
  Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.""
 2015-09-16 01:44:58 +00:00
Zach Jang
00db082656 am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev 
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
 2015-09-16 01:44:53 +00:00
Zach Jang
3ee9945be3 Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" 
This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e.

Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d
 2015-09-16 01:38:41 +00:00
Zach Jang
3b49affdb3 Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s." 
This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61.

Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
 2015-09-15 20:09:52 +00:00
Tao Bao
0bafa33fcd am 35c1eb9e: am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '35c1eb9e6506b407a1af40359d48bb06d884385d':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:19:58 +00:00
Tao Bao
35c1eb9e65 am 82b70db7: [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
* commit '82b70db7dd906013d131737a5bec2ae59b41ae61':
  [DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
 2015-08-31 22:03:44 +00:00
Tao Bao
82b70db7dd [DO NOT MERGE] Bump up the timeout for uncrypt to 900s. 
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
 2015-08-31 14:34:14 -07:00
Paul Jensen
a12044215b Fix NOT_RESTRICTED network capability and enforce it. 
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
   special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
   permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
   CONNECTIVITY_INTERNAL permission

Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)
 2015-08-28 12:48:11 -04:00
Wale Ogunwale
655b08c38a am b6f87997: am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit 'b6f87997cb6ea557dc84e77c18c5bb22f99411fc':
  Prevent system uid component from running in an app process
 2015-07-02 00:52:29 +00:00
Filip Gruszczynski
aabc9869a9 am 03850591: Handle outsets when resized is called due to rotation. 
* commit '03850591954faf5280fd581dd04cd6958eda0124':
  Handle outsets when resized is called due to rotation.
 2015-07-02 00:47:48 +00:00
Wale Ogunwale
b6f87997cb am f54d1722: am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit 'f54d17224bada1d852ba7c9d4bb9e2a792c0093b':
  Prevent system uid component from running in an app process
 2015-07-02 00:35:47 +00:00
Filip Gruszczynski
0385059195 Handle outsets when resized is called due to rotation. 
Rotation might change while the wallpaper is displayed. If outsets are
present, this must trigger a resized callback and the wallpaper must
take these accounts immediately into account before requesting relayout.

Bug: 22209764

Change-Id: I97f2670f384ccac792e7c2727eb0ef017ec66188
 2015-07-01 10:23:47 -07:00
Wale Ogunwale
f54d17224b am 52034328: am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '52034328081e8c3420f9228192343835465afa13':
  Prevent system uid component from running in an app process
 2015-07-01 17:19:20 +00:00
Wale Ogunwale
5203432808 am 131e6b24: Merge "Prevent system uid component from running in an app process" into lmp-mr1-dev 
* commit '131e6b24d88c4704687f41e9a016ab1919c53fa4':
  Prevent system uid component from running in an app process
 2015-07-01 17:03:54 +00:00
Wale Ogunwale
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
 2015-07-01 16:39:11 +00:00
Wale Ogunwale
ec425a19f9 am df9948d8: Merge "Prevent system uid component from running in an app process" into lmp-dev 
* commit 'df9948d81232a03271113c16bee6f3ab6b826bad':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:42 +00:00
Filip Gruszczynski
300ccf4ab5 am 0ec1328f: Calculate outset hint when adding window. 
* commit '0ec1328f85a08a610868856c688ebb8196c79c17':
  Calculate outset hint when adding window.
 2015-06-30 20:20:48 +00:00
Filip Gruszczynski
0ec1328f85 Calculate outset hint when adding window. 
Outsets aren't dynamic so they are a great candidate for a hint when the
window is added through the window manager. Thanks to this during first
view hierarchy measure or wallpaper window layout they are immediately
available and don't require multiple measure/layout passes.

Bug: 21593814
Change-Id: I573c15ffbbe4fcd8a6ed9c5e4fcd6cfbbcd7434f
 2015-06-30 12:42:17 -07:00
Filip Gruszczynski
e89d821e33 am b6c158f9: Merge "Dump of previous vibrations." into cw-d-mr1-dev 
* commit 'b6c158f9d863768d5d8315f2a4a4bb87c4db2fea':
  Dump of previous vibrations.
 2015-06-29 20:59:50 +00:00
Filip Gruszczynski
b6c158f9d8 Merge "Dump of previous vibrations." into cw-d-mr1-dev 2015-06-29 20:47:10 +00:00
Filip Gruszczynski
3a8eb0f670 Dump of previous vibrations. 
It's hard to find previous vibrations when you chase excessive use that
impacts the battery. A dump of previous vibrations allows us to
investigate where the vibrations come from.

Bug: 21933068
Change-Id: I14944732927c73401e5adc7345ea9823092b1883
 2015-06-29 09:28:32 -07:00
Prashant Malani
b3d02465f8 am 9a3eacbe: Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 
* commit '9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab':
  Revert "Always re-establish kernel alarms when considering new alarm set"
 2015-06-26 21:12:49 +00:00
Prashant Malani
9a3eacbe9c Merge "Revert "Always re-establish kernel alarms when considering new alarm set"" into cw-d-mr1-dev 2015-06-26 21:00:11 +00:00